Fix bug #8608.

Regenerate files based on recent commits to Mesa (that fix Mesa bug
that return pixel data.

8 files changed, 1903 insertions, 1436 deletions

diff --git a/GL/glx/indirect_dispatch.c b/GL/glx/indirect_dispatch.c
index d43afeb68..d86dedfd5 100644
--- a/GL/glx/indirect_dispatch.c
+++ b/GL/glx/indirect_dispatch.c
@@ -2756,6 +2756,31 @@ int __glXDisp_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_AreTexturesResidentEXT(__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);
+
+        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
+        ) );
+        __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
+        error = Success;
+    }
+
+    return error;
+}
+
 void __glXDisp_CopyTexImage1D(GLbyte * pc)
 {
     CALL_CopyTexImage1D( GET_DISPATCH(), (
@@ -2811,6 +2836,26 @@ void __glXDisp_CopyTexSubImage2D(GLbyte * pc)
 
 int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
 {
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
+
+        CALL_DeleteTextures( GET_DISPATCH(), (
+            n,
+             (const GLuint *)(pc +  4)
+        ) );
+        error = Success;
+    }
+
+    return error;
+}
+
+int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
+{
     xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
@@ -2852,6 +2897,29 @@ int __glXDisp_GenTextures(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_GenTexturesEXT(__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 * 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;
+    }
+
+    return error;
+}
+
 int __glXDisp_IsTexture(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -2871,6 +2939,25 @@ int __glXDisp_IsTexture(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_IsTextureEXT(__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_IsTexture( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0)
+        ) );
+        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
+        error = Success;
+    }
+
+    return error;
+}
+
 void __glXDisp_PrioritizeTextures(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei  *)(pc +  0);
@@ -3039,6 +3126,35 @@ int __glXDisp_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_GetColorTableParameterfvSGI(__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);
+
+        const GLuint compsize = __glGetColorTableParameterfv_size(pname);
+        GLfloat answerBuffer[200];
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetColorTableParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDisp_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3068,6 +3184,35 @@ int __glXDisp_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_GetColorTableParameterivSGI(__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);
+
+        const GLuint compsize = __glGetColorTableParameteriv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetColorTableParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 void __glXDisp_ColorSubTable(GLbyte * pc)
 {
     const GLvoid * const data = (const GLvoid *) (pc + 40);
@@ -3244,6 +3389,35 @@ int __glXDisp_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_GetConvolutionParameterfvEXT(__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);
+
+        const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
+        GLfloat answerBuffer[200];
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetConvolutionParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDisp_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3273,6 +3447,35 @@ int __glXDisp_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_GetConvolutionParameterivEXT(__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);
+
+        const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetConvolutionParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDisp_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3302,6 +3505,35 @@ int __glXDisp_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_GetHistogramParameterfvEXT(__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);
+
+        const GLuint compsize = __glGetHistogramParameterfv_size(pname);
+        GLfloat answerBuffer[200];
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetHistogramParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDisp_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3331,6 +3563,35 @@ int __glXDisp_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_GetHistogramParameterivEXT(__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);
+
+        const GLuint compsize = __glGetHistogramParameteriv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetHistogramParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDisp_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3360,6 +3621,35 @@ int __glXDisp_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_GetMinmaxParameterfvEXT(__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);
+
+        const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
+        GLfloat answerBuffer[200];
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetMinmaxParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDisp_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3389,6 +3679,35 @@ int __glXDisp_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDisp_GetMinmaxParameterivEXT(__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);
+
+        const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetMinmaxParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 void __glXDisp_Histogram(GLbyte * pc)
 {
     CALL_Histogram( GET_DISPATCH(), (
@@ -4414,131 +4733,6 @@ void __glXDisp_DrawBuffersARB(GLbyte * pc)
     ) );
 }
 
-int __glXDisp_GetColorTableParameterfvSGI(__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);
-
-        const GLuint compsize = __glGetColorTableParameterfvSGI_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameterfvSGI( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetColorTableParameterivSGI(__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);
-
-        const GLuint compsize = __glGetColorTableParameterivSGI_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameterivSGI( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_AreTexturesResidentEXT(__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);
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval = CALL_AreTexturesResidentEXT( GET_DISPATCH(), (
-            n,
-             (const GLuint *)(pc +  4),
-            residences
-        ) );
-        __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GenTexturesEXT(__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 * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenTexturesEXT( GET_DISPATCH(), (
-            n,
-            textures
-        ) );
-        __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_IsTextureEXT(__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_IsTextureEXT( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
 void __glXDisp_SampleMaskSGIS(GLbyte * pc)
 {
     CALL_SampleMaskSGIS( GET_DISPATCH(), (
diff --git a/GL/glx/indirect_dispatch.h b/GL/glx/indirect_dispatch.h
index c259fd930..9bf74ebd1 100644
--- a/GL/glx/indirect_dispatch.h
+++ b/GL/glx/indirect_dispatch.h
@@ -61,8 +61,6 @@ extern HIDDEN void __glXDisp_ActiveTextureARB(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_ActiveTextureARB(GLbyte * pc);
 extern HIDDEN void __glXDisp_VertexAttrib4ubvNV(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_VertexAttrib4ubvNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetColorTableParameterfvSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetColorTableParameterfvSGI(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetProgramNamedParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetProgramNamedParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_Histogram(GLbyte * pc);
@@ -163,6 +161,8 @@ extern HIDDEN void __glXDisp_Color3sv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Color3sv(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetConvolutionParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetConvolutionParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetConvolutionParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetConvolutionParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_Vertex2dv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Vertex2dv(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetVisualConfigs(struct __GLXclientStateRec *, GLbyte *);
@@ -251,6 +251,8 @@ extern HIDDEN void __glXDisp_Color3usv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Color3usv(GLbyte * pc);
 extern HIDDEN int __glXDisp_AreTexturesResident(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_AreTexturesResident(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_IsRenderbufferEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_IsRenderbufferEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_PointParameterfvEXT(GLbyte * pc);
@@ -319,6 +321,8 @@ extern HIDDEN int __glXDisp_CreateNewContext(struct __GLXclientStateRec *, GLbyt
 extern HIDDEN int __glXDispSwap_CreateNewContext(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetMinmax(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetMinmax(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetMinmaxEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetMinmaxEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetVertexAttribdvNV(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetVertexAttribdvNV(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_Normal3fv(GLbyte * pc);
@@ -409,6 +413,8 @@ extern HIDDEN void __glXDisp_VertexAttrib1dvNV(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_VertexAttrib1dvNV(GLbyte * pc);
 extern HIDDEN int __glXDisp_GenTextures(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GenTextures(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GenTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GenTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_FramebufferTexture1DEXT(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_FramebufferTexture1DEXT(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
@@ -469,6 +475,8 @@ extern HIDDEN void __glXDisp_CopyTexSubImage3D(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_CopyTexSubImage3D(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetColorTable(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetColorTable(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetColorTableSGI(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetColorTableSGI(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_Indexiv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Indexiv(GLbyte * pc);
 extern HIDDEN int __glXDisp_CreateContext(struct __GLXclientStateRec *, GLbyte *);
@@ -477,6 +485,8 @@ extern HIDDEN void __glXDisp_CopyColorTable(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_CopyColorTable(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetHistogramParameterfv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetHistogramParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetHistogramParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetHistogramParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_Frustum(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Frustum(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetString(struct __GLXclientStateRec *, GLbyte *);
@@ -493,6 +503,8 @@ extern HIDDEN void __glXDisp_VertexAttrib1dvARB(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_VertexAttrib1dvARB(GLbyte * pc);
 extern HIDDEN int __glXDisp_DeleteTextures(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_DeleteTextures(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_DeleteTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_DeleteTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_ClearAccum(GLbyte * pc);
@@ -587,6 +599,8 @@ extern HIDDEN void __glXDisp_Color3dv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Color3dv(GLbyte * pc);
 extern HIDDEN int __glXDisp_IsTexture(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_IsTexture(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_DeleteQueriesARB(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_DeleteQueriesARB(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetMapdv(struct __GLXclientStateRec *, GLbyte *);
@@ -617,6 +631,8 @@ extern HIDDEN int __glXDisp_GetVertexAttribdvARB(struct __GLXclientStateRec *, G
 extern HIDDEN int __glXDispSwap_GetVertexAttribdvARB(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetSeparableFilter(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetSeparableFilter(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetSeparableFilterEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetSeparableFilterEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_RequestResidentProgramsNV(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_RequestResidentProgramsNV(GLbyte * pc);
 extern HIDDEN int __glXDisp_FeedbackBuffer(struct __GLXclientStateRec *, GLbyte *);
@@ -635,8 +651,6 @@ extern HIDDEN void __glXDisp_PolygonOffset(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_PolygonOffset(GLbyte * pc);
 extern HIDDEN void __glXDisp_ExecuteProgramNV(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_ExecuteProgramNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetColorTableParameterivSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetColorTableParameterivSGI(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_Normal3dv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Normal3dv(GLbyte * pc);
 extern HIDDEN void __glXDisp_Lightf(GLbyte * pc);
@@ -685,6 +699,8 @@ extern HIDDEN int __glXDisp_SwapIntervalSGI(struct __GLXclientStateRec *, GLbyte
 extern HIDDEN int __glXDispSwap_SwapIntervalSGI(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetColorTableParameterfv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetColorTableParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetColorTableParameterfvSGI(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetColorTableParameterfvSGI(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_Bitmap(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Bitmap(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetTexLevelParameterfv(struct __GLXclientStateRec *, GLbyte *);
@@ -725,6 +741,8 @@ extern HIDDEN int __glXDisp_ChangeDrawableAttributes(struct __GLXclientStateRec
 extern HIDDEN int __glXDispSwap_ChangeDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetMinmaxParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetMinmaxParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetMinmaxParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetMinmaxParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_PixelTransferf(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_PixelTransferf(GLbyte * pc);
 extern HIDDEN void __glXDisp_CopyTexImage1D(GLbyte * pc);
@@ -755,6 +773,8 @@ extern HIDDEN void __glXDisp_ConvolutionParameterf(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_ConvolutionParameterf(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetColorTableParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetColorTableParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetColorTableParameterivSGI(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetColorTableParameterivSGI(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_ReleaseTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_ReleaseTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_CallList(GLbyte * pc);
@@ -773,8 +793,6 @@ extern HIDDEN void __glXDisp_BindRenderbufferEXT(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_BindRenderbufferEXT(GLbyte * pc);
 extern HIDDEN void __glXDisp_Vertex3sv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Vertex3sv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetColorTableSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetColorTableSGI(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_BindTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_BindTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc);
@@ -797,10 +815,10 @@ extern HIDDEN void __glXDisp_TexGendv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_TexGendv(GLbyte * pc);
 extern HIDDEN void __glXDisp_ResetMinmax(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_ResetMinmax(GLbyte * pc);
-extern HIDDEN int __glXDisp_GenTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GenTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetConvolutionParameterfv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetConvolutionParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetConvolutionParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetConvolutionParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_VertexAttribs4dvNV(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetMaterialfv(struct __GLXclientStateRec *, GLbyte *);
@@ -827,8 +845,12 @@ extern HIDDEN int __glXDisp_GetProgramLocalParameterdvARB(struct __GLXclientStat
 extern HIDDEN int __glXDispSwap_GetProgramLocalParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetHistogramParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetHistogramParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetHistogramParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetHistogramParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetProgramivARB(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetProgramivARB(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_BlendFuncSeparateEXT(GLbyte * pc);
@@ -841,8 +863,6 @@ extern HIDDEN void __glXDisp_EvalPoint1(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_EvalPoint1(GLbyte * pc);
 extern HIDDEN void __glXDisp_PopMatrix(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_PopMatrix(GLbyte * pc);
-extern HIDDEN int __glXDisp_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_MakeCurrentReadSGI(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_MakeCurrentReadSGI(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetTexGeniv(struct __GLXclientStateRec *, GLbyte *);
@@ -861,6 +881,8 @@ extern HIDDEN int __glXDisp_GetTexGenfv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetTexGenfv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetHistogram(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetHistogram(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetHistogramEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetHistogramEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_ActiveStencilFaceEXT(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_ActiveStencilFaceEXT(GLbyte * pc);
 extern HIDDEN void __glXDisp_Materialf(GLbyte * pc);
@@ -921,8 +943,6 @@ extern HIDDEN void __glXDisp_VertexAttrib4uivARB(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_VertexAttrib4uivARB(GLbyte * pc);
 extern HIDDEN void __glXDisp_ClipPlane(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_ClipPlane(GLbyte * pc);
-extern HIDDEN int __glXDisp_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetPixelMapuiv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetPixelMapuiv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_Indexfv(GLbyte * pc);
@@ -1005,6 +1025,8 @@ extern HIDDEN void __glXDisp_VertexAttribs4svNV(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_VertexAttribs4svNV(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetMinmaxParameterfv(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetMinmaxParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_GetMinmaxParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetMinmaxParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_VertexAttrib1fvARB(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_VertexAttrib1fvARB(GLbyte * pc);
 extern HIDDEN void __glXDisp_VertexAttribs1svNV(GLbyte * pc);
diff --git a/GL/glx/indirect_dispatch_swap.c b/GL/glx/indirect_dispatch_swap.c
index a84879a40..9c58ef1cd 100644
--- a/GL/glx/indirect_dispatch_swap.c
+++ b/GL/glx/indirect_dispatch_swap.c
@@ -2887,6 +2887,31 @@ int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_AreTexturesResidentEXT(__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 );
+
+        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
+        ) );
+        __glXSendReplySwap(cl->client, residences, n, 1, GL_TRUE, retval);
+        error = Success;
+    }
+
+    return error;
+}
+
 void __glXDispSwap_CopyTexImage1D(GLbyte * pc)
 {
     CALL_CopyTexImage1D( GET_DISPATCH(), (
@@ -2942,6 +2967,26 @@ void __glXDispSwap_CopyTexSubImage2D(GLbyte * pc)
 
 int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
 {
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
+    int 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 )
+        ) );
+        error = Success;
+    }
+
+    return error;
+}
+
+int __glXDispSwap_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
+{
     xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
@@ -2984,6 +3029,30 @@ int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_GenTexturesEXT(__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 * 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;
+    }
+
+    return error;
+}
+
 int __glXDispSwap_IsTexture(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3003,6 +3072,25 @@ int __glXDispSwap_IsTexture(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_IsTextureEXT(__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_IsTexture( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 )
+        ) );
+        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
+        error = Success;
+    }
+
+    return error;
+}
+
 void __glXDispSwap_PrioritizeTextures(GLbyte * pc)
 {
     const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
@@ -3172,6 +3260,36 @@ int __glXDispSwap_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_GetColorTableParameterfvSGI(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetColorTableParameterfv_size(pname);
+        GLfloat answerBuffer[200];
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        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 );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3202,6 +3320,36 @@ int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetColorTableParameteriv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        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 );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 void __glXDispSwap_ColorSubTable(GLbyte * pc)
 {
     const GLvoid * const data = (const GLvoid *) (pc + 40);
@@ -3379,6 +3527,36 @@ int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_GetConvolutionParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
+        GLfloat answerBuffer[200];
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        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 );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3409,6 +3587,36 @@ int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_GetConvolutionParameterivEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        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 );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3439,6 +3647,36 @@ int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_GetHistogramParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetHistogramParameterfv_size(pname);
+        GLfloat answerBuffer[200];
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        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 );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3469,6 +3707,36 @@ int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_GetHistogramParameterivEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetHistogramParameteriv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        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 );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3499,6 +3767,36 @@ int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_GetMinmaxParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
+        GLfloat answerBuffer[200];
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        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 );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXSingleReq * const req = (xGLXSingleReq *) pc;
@@ -3529,6 +3827,36 @@ int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
     return error;
 }
 
+int __glXDispSwap_GetMinmaxParameterivEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        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 );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
+}
+
 void __glXDispSwap_Histogram(GLbyte * pc)
 {
     CALL_Histogram( GET_DISPATCH(), (
@@ -4566,134 +4894,6 @@ void __glXDispSwap_DrawBuffersARB(GLbyte * pc)
     ) );
 }
 
-int __glXDispSwap_GetColorTableParameterfvSGI(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetColorTableParameterfvSGI_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameterfvSGI( 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;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetColorTableParameterivSGI_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameterivSGI( 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;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_AreTexturesResidentEXT(__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 );
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval = CALL_AreTexturesResidentEXT( 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;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GenTexturesEXT(__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 * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenTexturesEXT( GET_DISPATCH(), (
-            n,
-            textures
-        ) );
-        (void) bswap_32_array( (uint32_t *) textures, n );
-        __glXSendReplySwap(cl->client, textures, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_IsTextureEXT(__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_IsTextureEXT( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
 void __glXDispSwap_SampleMaskSGIS(GLbyte * pc)
 {
     CALL_SampleMaskSGIS( GET_DISPATCH(), (
diff --git a/GL/glx/indirect_size_get.c b/GL/glx/indirect_size_get.c
index 6ca9a3505..150c6a182 100644
--- a/GL/glx/indirect_size_get.c
+++ b/GL/glx/indirect_size_get.c
@@ -67,1100 +67,1124 @@
 
 
 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:
-            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:
+        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;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 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_DEPTH_TEXTURE_MODE:
+    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;
     }
 }
 
 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_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_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;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 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_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_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_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_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_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_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_OCCLUSION_TEST_HP:
-        case GL_OCCLUSION_TEST_RESULT_HP:
-        case GL_LIGHT_MODEL_COLOR_CONTROL:
-        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_OCCLUSION_TEST_HP:
+    case GL_OCCLUSION_TEST_RESULT_HP:
+    case GL_LIGHT_MODEL_COLOR_CONTROL:
+    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_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_NV:
-        case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
+    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_NV:
+    case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
 /*      case GL_NUM_TEXTURE_COMPRESSED_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_FRAGMENT_PROGRAM_ARB:
-        case GL_MAX_DRAW_BUFFERS_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_FRAGMENT_PROGRAM_ARB:
+    case GL_MAX_DRAW_BUFFERS_ARB:
 /*      case GL_MAX_DRAW_BUFFERS_ATI:*/
-        case GL_DRAW_BUFFER0_ARB:
+    case GL_DRAW_BUFFER0_ARB:
 /*      case GL_DRAW_BUFFER0_ATI:*/
-        case GL_DRAW_BUFFER1_ARB:
+    case GL_DRAW_BUFFER1_ARB:
 /*      case GL_DRAW_BUFFER1_ATI:*/
-        case GL_DRAW_BUFFER2_ARB:
+    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_ARB:
 /*      case GL_DRAW_BUFFER10_ATI:*/
-        case GL_DRAW_BUFFER11_ARB:
+    case GL_DRAW_BUFFER11_ARB:
 /*      case GL_DRAW_BUFFER11_ATI:*/
-        case GL_DRAW_BUFFER12_ARB:
+    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_ARB:
 /*      case GL_DRAW_BUFFER14_ATI:*/
-        case GL_DRAW_BUFFER15_ARB:
+    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_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_POINT_SPRITE_ARB:
 /*      case GL_POINT_SPRITE_NV:*/
-        case GL_POINT_SPRITE_R_MODE_NV:
-        case GL_MAX_VERTEX_ATTRIBS_ARB:
-        case GL_DEPTH_BOUNDS_TEST_EXT:
-        case GL_STENCIL_TEST_TWO_SIDE_EXT:
-        case GL_ACTIVE_STENCIL_FACE_EXT:
-        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:
-            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_POINT_SPRITE_R_MODE_NV:
+    case GL_MAX_VERTEX_ATTRIBS_ARB:
+    case GL_DEPTH_BOUNDS_TEST_EXT:
+    case GL_STENCIL_TEST_TWO_SIDE_EXT:
+    case GL_ACTIVE_STENCIL_FACE_EXT:
+    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:
+        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:
-            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:
+        return __glGetBooleanv_variable_size(e);
+    default:
+        return 0;
     }
 }
 
 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_DEPTH_TEXTURE_MODE:
+    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;
     }
 }
 
 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:*/
-            return 1;
-        default: return 0;
+        return 1;
+    default:
+        return 0;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 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;
     }
 }
 
 INTERNAL PURE FASTCALL GLint
-__glGetProgramivARB_size( GLenum e )
+__glGetProgramivARB_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_MAX_TEXTURE_COORDS_ARB:
-        case GL_MAX_TEXTURE_IMAGE_UNITS_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_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_MAX_TEXTURE_COORDS_ARB:
+    case GL_MAX_TEXTURE_IMAGE_UNITS_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;
     }
 }
 
 INTERNAL PURE FASTCALL GLint
-__glGetVertexAttribdvARB_size( GLenum e )
+__glGetVertexAttribdvARB_size(GLenum e)
 {
-    switch( e ) {
-        case GL_VERTEX_PROGRAM_ARB:
-        case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
-        case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:
-        case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
-        case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
-        case GL_CURRENT_VERTEX_ATTRIB_ARB:
-            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:
+        return 1;
+    default:
+        return 0;
     }
 }
 
 INTERNAL PURE FASTCALL GLint
-__glGetQueryObjectivARB_size( GLenum e )
+__glGetQueryObjectivARB_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_RESULT_ARB:
+    case GL_QUERY_RESULT_AVAILABLE_ARB:
+        return 1;
+    default:
+        return 0;
     }
 }
 
 INTERNAL PURE FASTCALL GLint
-__glGetQueryivARB_size( GLenum e )
+__glGetQueryivARB_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_QUERY_COUNTER_BITS_ARB:
+    case GL_CURRENT_QUERY_ARB:
+        return 1;
+    default:
+        return 0;
     }
 }
 
 INTERNAL PURE FASTCALL GLint
-__glPointParameterfvEXT_size( GLenum e )
+__glPointParameterfvEXT_size(GLenum e)
 {
-    switch( e ) {
-        case GL_POINT_SIZE_MIN:
+    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:
 /*      case GL_POINT_SIZE_MAX_ARB:*/
 /*      case GL_POINT_SIZE_MAX_SGIS:*/
-        case GL_POINT_FADE_THRESHOLD_SIZE:
+    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_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;
+        return 3;
+    default:
+        return 0;
     }
 }
 
 INTERNAL PURE FASTCALL GLint
-__glGetProgramivNV_size( GLenum e )
+__glGetProgramivNV_size(GLenum e)
 {
-    switch( e ) {
-        case GL_PROGRAM_LENGTH_NV:
-        case GL_PROGRAM_TARGET_NV:
-        case GL_PROGRAM_RESIDENT_NV:
-            return 1;
-        default: return 0;
+    switch (e) {
+    case GL_PROGRAM_LENGTH_NV:
+    case GL_PROGRAM_TARGET_NV:
+    case GL_PROGRAM_RESIDENT_NV:
+        return 1;
+    default:
+        return 0;
     }
 }
 
 INTERNAL PURE FASTCALL GLint
-__glGetVertexAttribdvNV_size( GLenum e )
+__glGetVertexAttribdvNV_size(GLenum e)
 {
-    switch( e ) {
-        case GL_ATTRIB_ARRAY_SIZE_NV:
-        case GL_ATTRIB_ARRAY_STRIDE_NV:
-        case GL_ATTRIB_ARRAY_TYPE_NV:
-        case GL_CURRENT_ATTRIB_NV:
-            return 1;
-        default: return 0;
+    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;
     }
 }
 
 INTERNAL PURE FASTCALL GLint
-__glGetFramebufferAttachmentParameterivEXT_size( GLenum e )
+__glGetFramebufferAttachmentParameterivEXT_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_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;
     }
 }
 
-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( GetColorTableParameterfvSGI, GetColorTableParameterfv )
-ALIAS( GetColorTableParameterivSGI, GetColorTableParameterfv )
-ALIAS( GetVertexAttribfvNV, GetVertexAttribdvNV )
-ALIAS( GetVertexAttribivNV, GetVertexAttribdvNV )
-ALIAS( PointParameterivNV, PointParameterfvEXT )
-
+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
 #  undef INTERNAL
diff --git a/GL/glx/indirect_size_get.h b/GL/glx/indirect_size_get.h
index c6f9532ce..4fcb55b4e 100644
--- a/GL/glx/indirect_size_get.h
+++ b/GL/glx/indirect_size_get.h
@@ -73,8 +73,10 @@ extern INTERNAL PURE FASTCALL GLint __glGetTexLevelParameterfv_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetTexLevelParameteriv_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameterfv_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameteriv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetConvolutionParameterfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetConvolutionParameteriv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint
+__glGetConvolutionParameterfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint
+__glGetConvolutionParameteriv_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetHistogramParameterfv_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetHistogramParameteriv_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetMinmaxParameterfv_size(GLenum);
@@ -86,13 +88,12 @@ extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribivARB_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetQueryObjectivARB_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetQueryObjectuivARB_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetQueryivARB_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameterfvSGI_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameterivSGI_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetProgramivNV_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvNV_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvNV_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribivNV_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetFramebufferAttachmentParameterivEXT_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint
+__glGetFramebufferAttachmentParameterivEXT_size(GLenum);
 
 #  undef PURE
 #  undef FASTCALL
diff --git a/GL/glx/indirect_table.c b/GL/glx/indirect_table.c
index 57712f4f5..a6fd3a39a 100644
--- a/GL/glx/indirect_table.c
+++ b/GL/glx/indirect_table.c
@@ -163,7 +163,7 @@ static const void *Single_function_table[112][2] = {
     /* [ 85] =   141 */ {__glXDisp_IsList, __glXDispSwap_IsList},
     /* [ 86] =   142 */ {__glXDisp_Flush, __glXDispSwap_Flush},
     /* [ 87] =   143 */ {__glXDisp_AreTexturesResident, __glXDispSwap_AreTexturesResident},
-    /* [ 88] =   144 */ {NULL, NULL},
+    /* [ 88] =   144 */ {__glXDisp_DeleteTextures, __glXDispSwap_DeleteTextures},
     /* [ 89] =   145 */ {__glXDisp_GenTextures, __glXDispSwap_GenTextures},
     /* [ 90] =   146 */ {__glXDisp_IsTexture, __glXDispSwap_IsTexture},
     /* [ 91] =   147 */ {__glXDisp_GetColorTable, __glXDispSwap_GetColorTable},
@@ -1232,12 +1232,12 @@ const struct __glXDispatchInfo Render_dispatch_info = {
 
 /*****************************************************************/
 /* tree depth = 13 */
-static const int_fast16_t VendorPriv_dispatch_tree[158] = {
+static const int_fast16_t VendorPriv_dispatch_tree[155] = {
     /* [0] -> opcode range [0, 131072], node depth 1 */
     2,
     5,
     EMPTY_LEAF,
-    122,
+    119,
     EMPTY_LEAF,
 
     /* [5] -> opcode range [0, 32768], node depth 2 */
@@ -1254,14 +1254,14 @@ static const int_fast16_t VendorPriv_dispatch_tree[158] = {
     2,
     16,
     EMPTY_LEAF,
-    81,
+    78,
     EMPTY_LEAF,
 
     /* [16] -> opcode range [0, 2048], node depth 5 */
     2,
     21,
     EMPTY_LEAF,
-    39,
+    36,
     EMPTY_LEAF,
 
     /* [21] -> opcode range [0, 512], node depth 6 */
@@ -1286,298 +1286,301 @@ static const int_fast16_t VendorPriv_dispatch_tree[158] = {
 
     /* [33] -> opcode range [0, 32], node depth 10 */
     1,
-    36,
+    LEAF(0),
     EMPTY_LEAF,
 
-    /* [36] -> opcode range [0, 16], node depth 11 */
-    1,
+    /* [36] -> opcode range [1024, 1536], node depth 6 */
+    2,
+    41,
     EMPTY_LEAF,
-    LEAF(0),
+    53,
+    67,
 
-    /* [39] -> opcode range [1024, 1536], node depth 6 */
-    2,
+    /* [41] -> opcode range [1024, 1152], node depth 7 */
+    1,
     44,
     EMPTY_LEAF,
-    56,
-    70,
 
-    /* [44] -> opcode range [1024, 1152], node depth 7 */
+    /* [44] -> opcode range [1024, 1088], node depth 8 */
     1,
     47,
     EMPTY_LEAF,
 
-    /* [47] -> opcode range [1024, 1088], node depth 8 */
+    /* [47] -> opcode range [1024, 1056], node depth 9 */
     1,
     50,
     EMPTY_LEAF,
 
-    /* [50] -> opcode range [1024, 1056], node depth 9 */
-    1,
-    53,
-    EMPTY_LEAF,
-
-    /* [53] -> opcode range [1024, 1040], node depth 10 */
+    /* [50] -> opcode range [1024, 1040], node depth 10 */
     1,
-    LEAF(8),
+    LEAF(16),
     EMPTY_LEAF,
 
-    /* [56] -> opcode range [1280, 1408], node depth 7 */
+    /* [53] -> opcode range [1280, 1408], node depth 7 */
     1,
-    59,
+    56,
     EMPTY_LEAF,
 
-    /* [59] -> opcode range [1280, 1344], node depth 8 */
+    /* [56] -> opcode range [1280, 1344], node depth 8 */
     2,
-    64,
-    LEAF(16),
+    61,
+    LEAF(24),
     EMPTY_LEAF,
-    67,
+    64,
 
-    /* [64] -> opcode range [1280, 1296], node depth 9 */
+    /* [61] -> opcode range [1280, 1296], node depth 9 */
     1,
     EMPTY_LEAF,
-    LEAF(32),
+    LEAF(40),
 
-    /* [67] -> opcode range [1328, 1344], node depth 9 */
+    /* [64] -> opcode range [1328, 1344], node depth 9 */
     1,
-    LEAF(40),
+    LEAF(48),
     EMPTY_LEAF,
 
-    /* [70] -> opcode range [1408, 1536], node depth 7 */
+    /* [67] -> opcode range [1408, 1536], node depth 7 */
     1,
-    73,
+    70,
     EMPTY_LEAF,
 
-    /* [73] -> opcode range [1408, 1472], node depth 8 */
+    /* [70] -> opcode range [1408, 1472], node depth 8 */
     1,
-    76,
+    73,
     EMPTY_LEAF,
 
-    /* [76] -> opcode range [1408, 1440], node depth 9 */
+    /* [73] -> opcode range [1408, 1440], node depth 9 */
     2,
     EMPTY_LEAF,
-    LEAF(48),
     LEAF(56),
+    LEAF(64),
     EMPTY_LEAF,
 
-    /* [81] -> opcode range [4096, 6144], node depth 5 */
+    /* [78] -> opcode range [4096, 6144], node depth 5 */
     2,
-    86,
+    83,
     EMPTY_LEAF,
-    104,
+    101,
     EMPTY_LEAF,
 
-    /* [86] -> opcode range [4096, 4608], node depth 6 */
+    /* [83] -> opcode range [4096, 4608], node depth 6 */
+    1,
+    86,
+    EMPTY_LEAF,
+
+    /* [86] -> opcode range [4096, 4352], node depth 7 */
     1,
     89,
     EMPTY_LEAF,
 
-    /* [89] -> opcode range [4096, 4352], node depth 7 */
+    /* [89] -> opcode range [4096, 4224], node depth 8 */
     1,
     92,
     EMPTY_LEAF,
 
-    /* [92] -> opcode range [4096, 4224], node depth 8 */
+    /* [92] -> opcode range [4096, 4160], node depth 9 */
     1,
     95,
     EMPTY_LEAF,
 
-    /* [95] -> opcode range [4096, 4160], node depth 9 */
+    /* [95] -> opcode range [4096, 4128], node depth 10 */
     1,
     98,
     EMPTY_LEAF,
 
-    /* [98] -> opcode range [4096, 4128], node depth 10 */
+    /* [98] -> opcode range [4096, 4112], node depth 11 */
     1,
-    101,
+    LEAF(72),
     EMPTY_LEAF,
 
-    /* [101] -> opcode range [4096, 4112], node depth 11 */
+    /* [101] -> opcode range [5120, 5632], node depth 6 */
     1,
-    LEAF(64),
+    104,
     EMPTY_LEAF,
 
-    /* [104] -> opcode range [5120, 5632], node depth 6 */
+    /* [104] -> opcode range [5120, 5376], node depth 7 */
     1,
     107,
     EMPTY_LEAF,
 
-    /* [107] -> opcode range [5120, 5376], node depth 7 */
+    /* [107] -> opcode range [5120, 5248], node depth 8 */
     1,
     110,
     EMPTY_LEAF,
 
-    /* [110] -> opcode range [5120, 5248], node depth 8 */
+    /* [110] -> opcode range [5120, 5184], node depth 9 */
     1,
-    113,
     EMPTY_LEAF,
+    113,
 
-    /* [113] -> opcode range [5120, 5184], node depth 9 */
+    /* [113] -> opcode range [5152, 5184], node depth 10 */
     1,
-    EMPTY_LEAF,
     116,
+    EMPTY_LEAF,
 
-    /* [116] -> opcode range [5152, 5184], node depth 10 */
+    /* [116] -> opcode range [5152, 5168], node depth 11 */
     1,
-    119,
+    LEAF(80),
     EMPTY_LEAF,
 
-    /* [119] -> opcode range [5152, 5168], node depth 11 */
+    /* [119] -> opcode range [65536, 98304], node depth 2 */
     1,
-    LEAF(72),
+    122,
     EMPTY_LEAF,
 
-    /* [122] -> opcode range [65536, 98304], node depth 2 */
+    /* [122] -> opcode range [65536, 81920], node depth 3 */
     1,
     125,
     EMPTY_LEAF,
 
-    /* [125] -> opcode range [65536, 81920], node depth 3 */
+    /* [125] -> opcode range [65536, 73728], node depth 4 */
     1,
     128,
     EMPTY_LEAF,
 
-    /* [128] -> opcode range [65536, 73728], node depth 4 */
+    /* [128] -> opcode range [65536, 69632], node depth 5 */
     1,
     131,
     EMPTY_LEAF,
 
-    /* [131] -> opcode range [65536, 69632], node depth 5 */
+    /* [131] -> opcode range [65536, 67584], node depth 6 */
     1,
     134,
     EMPTY_LEAF,
 
-    /* [134] -> opcode range [65536, 67584], node depth 6 */
+    /* [134] -> opcode range [65536, 66560], node depth 7 */
     1,
     137,
     EMPTY_LEAF,
 
-    /* [137] -> opcode range [65536, 66560], node depth 7 */
+    /* [137] -> opcode range [65536, 66048], node depth 8 */
     1,
     140,
     EMPTY_LEAF,
 
-    /* [140] -> opcode range [65536, 66048], node depth 8 */
+    /* [140] -> opcode range [65536, 65792], node depth 9 */
     1,
     143,
     EMPTY_LEAF,
 
-    /* [143] -> opcode range [65536, 65792], node depth 9 */
+    /* [143] -> opcode range [65536, 65664], node depth 10 */
     1,
     146,
     EMPTY_LEAF,
 
-    /* [146] -> opcode range [65536, 65664], node depth 10 */
+    /* [146] -> opcode range [65536, 65600], node depth 11 */
     1,
     149,
     EMPTY_LEAF,
 
-    /* [149] -> opcode range [65536, 65600], node depth 11 */
+    /* [149] -> opcode range [65536, 65568], node depth 12 */
     1,
     152,
     EMPTY_LEAF,
 
-    /* [152] -> opcode range [65536, 65568], node depth 12 */
-    1,
-    155,
-    EMPTY_LEAF,
-
-    /* [155] -> opcode range [65536, 65552], node depth 13 */
+    /* [152] -> opcode range [65536, 65552], node depth 13 */
     1,
-    LEAF(80),
+    LEAF(88),
     EMPTY_LEAF,
 
 };
 
-static const void *VendorPriv_function_table[88][2] = {
-    /* [  0] =     8 */ {NULL, NULL},
-    /* [  1] =     9 */ {NULL, NULL},
-    /* [  2] =    10 */ {NULL, NULL},
-    /* [  3] =    11 */ {__glXDisp_AreTexturesResidentEXT, __glXDispSwap_AreTexturesResidentEXT},
-    /* [  4] =    12 */ {__glXDisp_DeleteTextures, __glXDispSwap_DeleteTextures},
-    /* [  5] =    13 */ {__glXDisp_GenTexturesEXT, __glXDispSwap_GenTexturesEXT},
-    /* [  6] =    14 */ {__glXDisp_IsTextureEXT, __glXDispSwap_IsTextureEXT},
-    /* [  7] =    15 */ {NULL, NULL},
-    /* [  8] =  1024 */ {__glXDisp_QueryContextInfoEXT, __glXDispSwap_QueryContextInfoEXT},
-    /* [  9] =  1025 */ {NULL, NULL},
-    /* [ 10] =  1026 */ {NULL, NULL},
-    /* [ 11] =  1027 */ {NULL, NULL},
-    /* [ 12] =  1028 */ {NULL, NULL},
-    /* [ 13] =  1029 */ {NULL, NULL},
-    /* [ 14] =  1030 */ {NULL, NULL},
-    /* [ 15] =  1031 */ {NULL, NULL},
-    /* [ 16] =  1296 */ {__glXDisp_GetProgramEnvParameterfvARB, __glXDispSwap_GetProgramEnvParameterfvARB},
-    /* [ 17] =  1297 */ {__glXDisp_GetProgramEnvParameterdvARB, __glXDispSwap_GetProgramEnvParameterdvARB},
-    /* [ 18] =  1298 */ {__glXDisp_GetProgramivNV, __glXDispSwap_GetProgramivNV},
-    /* [ 19] =  1299 */ {__glXDisp_GetProgramStringNV, __glXDispSwap_GetProgramStringNV},
-    /* [ 20] =  1300 */ {__glXDisp_GetTrackMatrixivNV, __glXDispSwap_GetTrackMatrixivNV},
-    /* [ 21] =  1301 */ {__glXDisp_GetVertexAttribdvARB, __glXDispSwap_GetVertexAttribdvARB},
-    /* [ 22] =  1302 */ {__glXDisp_GetVertexAttribfvNV, __glXDispSwap_GetVertexAttribfvNV},
-    /* [ 23] =  1303 */ {__glXDisp_GetVertexAttribivNV, __glXDispSwap_GetVertexAttribivNV},
-    /* [ 24] =  1304 */ {__glXDisp_IsProgramNV, __glXDispSwap_IsProgramNV},
-    /* [ 25] =  1305 */ {__glXDisp_GetProgramLocalParameterfvARB, __glXDispSwap_GetProgramLocalParameterfvARB},
-    /* [ 26] =  1306 */ {__glXDisp_GetProgramLocalParameterdvARB, __glXDispSwap_GetProgramLocalParameterdvARB},
-    /* [ 27] =  1307 */ {__glXDisp_GetProgramivARB, __glXDispSwap_GetProgramivARB},
-    /* [ 28] =  1308 */ {__glXDisp_GetProgramStringARB, __glXDispSwap_GetProgramStringARB},
-    /* [ 29] =  1309 */ {NULL, NULL},
-    /* [ 30] =  1310 */ {__glXDisp_GetProgramNamedParameterfvNV, __glXDispSwap_GetProgramNamedParameterfvNV},
-    /* [ 31] =  1311 */ {__glXDisp_GetProgramNamedParameterdvNV, __glXDispSwap_GetProgramNamedParameterdvNV},
-    /* [ 32] =  1288 */ {NULL, NULL},
-    /* [ 33] =  1289 */ {NULL, NULL},
-    /* [ 34] =  1290 */ {NULL, NULL},
-    /* [ 35] =  1291 */ {NULL, NULL},
-    /* [ 36] =  1292 */ {NULL, NULL},
-    /* [ 37] =  1293 */ {__glXDisp_AreProgramsResidentNV, __glXDispSwap_AreProgramsResidentNV},
-    /* [ 38] =  1294 */ {__glXDisp_DeleteProgramsNV, __glXDispSwap_DeleteProgramsNV},
-    /* [ 39] =  1295 */ {__glXDisp_GenProgramsNV, __glXDispSwap_GenProgramsNV},
-    /* [ 40] =  1328 */ {NULL, NULL},
-    /* [ 41] =  1329 */ {NULL, NULL},
-    /* [ 42] =  1330 */ {__glXDisp_BindTexImageEXT, __glXDispSwap_BindTexImageEXT},
-    /* [ 43] =  1331 */ {__glXDisp_ReleaseTexImageEXT, __glXDispSwap_ReleaseTexImageEXT},
-    /* [ 44] =  1332 */ {NULL, NULL},
-    /* [ 45] =  1333 */ {NULL, NULL},
-    /* [ 46] =  1334 */ {NULL, NULL},
-    /* [ 47] =  1335 */ {NULL, NULL},
-    /* [ 48] =  1416 */ {NULL, NULL},
-    /* [ 49] =  1417 */ {NULL, NULL},
-    /* [ 50] =  1418 */ {NULL, NULL},
-    /* [ 51] =  1419 */ {NULL, NULL},
-    /* [ 52] =  1420 */ {NULL, NULL},
-    /* [ 53] =  1421 */ {NULL, NULL},
-    /* [ 54] =  1422 */ {__glXDisp_IsRenderbufferEXT, __glXDispSwap_IsRenderbufferEXT},
-    /* [ 55] =  1423 */ {__glXDisp_GenRenderbuffersEXT, __glXDispSwap_GenRenderbuffersEXT},
-    /* [ 56] =  1424 */ {__glXDisp_GetRenderbufferParameterivEXT, __glXDispSwap_GetRenderbufferParameterivEXT},
-    /* [ 57] =  1425 */ {__glXDisp_IsFramebufferEXT, __glXDispSwap_IsFramebufferEXT},
-    /* [ 58] =  1426 */ {__glXDisp_GenFramebuffersEXT, __glXDispSwap_GenFramebuffersEXT},
-    /* [ 59] =  1427 */ {__glXDisp_CheckFramebufferStatusEXT, __glXDispSwap_CheckFramebufferStatusEXT},
-    /* [ 60] =  1428 */ {__glXDisp_GetFramebufferAttachmentParameterivEXT, __glXDispSwap_GetFramebufferAttachmentParameterivEXT},
-    /* [ 61] =  1429 */ {NULL, NULL},
-    /* [ 62] =  1430 */ {NULL, NULL},
-    /* [ 63] =  1431 */ {NULL, NULL},
-    /* [ 64] =  4096 */ {NULL, NULL},
-    /* [ 65] =  4097 */ {NULL, NULL},
-    /* [ 66] =  4098 */ {__glXDisp_GetColorTableSGI, __glXDispSwap_GetColorTableSGI},
-    /* [ 67] =  4099 */ {__glXDisp_GetColorTableParameterfvSGI, __glXDispSwap_GetColorTableParameterfvSGI},
-    /* [ 68] =  4100 */ {__glXDisp_GetColorTableParameterivSGI, __glXDispSwap_GetColorTableParameterivSGI},
-    /* [ 69] =  4101 */ {NULL, NULL},
-    /* [ 70] =  4102 */ {NULL, NULL},
-    /* [ 71] =  4103 */ {NULL, NULL},
-    /* [ 72] =  5152 */ {NULL, NULL},
-    /* [ 73] =  5153 */ {NULL, NULL},
-    /* [ 74] =  5154 */ {__glXDisp_CopySubBufferMESA, __glXDispSwap_CopySubBufferMESA},
-    /* [ 75] =  5155 */ {NULL, NULL},
-    /* [ 76] =  5156 */ {NULL, NULL},
-    /* [ 77] =  5157 */ {NULL, NULL},
-    /* [ 78] =  5158 */ {NULL, NULL},
-    /* [ 79] =  5159 */ {NULL, NULL},
-    /* [ 80] = 65536 */ {__glXDisp_SwapIntervalSGI, __glXDispSwap_SwapIntervalSGI},
-    /* [ 81] = 65537 */ {__glXDisp_MakeCurrentReadSGI, __glXDispSwap_MakeCurrentReadSGI},
-    /* [ 82] = 65538 */ {NULL, NULL},
-    /* [ 83] = 65539 */ {NULL, NULL},
-    /* [ 84] = 65540 */ {__glXDisp_GetFBConfigsSGIX, __glXDispSwap_GetFBConfigsSGIX},
-    /* [ 85] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX},
-    /* [ 86] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
-    /* [ 87] = 65543 */ {NULL, NULL},
+static const void *VendorPriv_function_table[96][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},
+    /* [  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},
+    /* [ 14] =    14 */ {__glXDisp_IsTextureEXT, __glXDispSwap_IsTextureEXT},
+    /* [ 15] =    15 */ {NULL, NULL},
+    /* [ 16] =  1024 */ {__glXDisp_QueryContextInfoEXT, __glXDispSwap_QueryContextInfoEXT},
+    /* [ 17] =  1025 */ {NULL, NULL},
+    /* [ 18] =  1026 */ {NULL, NULL},
+    /* [ 19] =  1027 */ {NULL, NULL},
+    /* [ 20] =  1028 */ {NULL, NULL},
+    /* [ 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_GetVertexAttribfvNV, __glXDispSwap_GetVertexAttribfvNV},
+    /* [ 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},
+    /* [ 37] =  1309 */ {NULL, NULL},
+    /* [ 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},
+    /* [ 48] =  1328 */ {NULL, NULL},
+    /* [ 49] =  1329 */ {NULL, NULL},
+    /* [ 50] =  1330 */ {__glXDisp_BindTexImageEXT, __glXDispSwap_BindTexImageEXT},
+    /* [ 51] =  1331 */ {__glXDisp_ReleaseTexImageEXT, __glXDispSwap_ReleaseTexImageEXT},
+    /* [ 52] =  1332 */ {NULL, NULL},
+    /* [ 53] =  1333 */ {NULL, NULL},
+    /* [ 54] =  1334 */ {NULL, NULL},
+    /* [ 55] =  1335 */ {NULL, NULL},
+    /* [ 56] =  1416 */ {NULL, NULL},
+    /* [ 57] =  1417 */ {NULL, NULL},
+    /* [ 58] =  1418 */ {NULL, NULL},
+    /* [ 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},
+    /* [ 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},
+    /* [ 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},
+    /* [ 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},
+    /* [ 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 */ {NULL, NULL},
 };
 
 const struct __glXDispatchInfo VendorPriv_dispatch_info = {
diff --git a/GL/glx/singlepix.c b/GL/glx/singlepix.c
index 3f76e5e62..98898aa3a 100644
--- a/GL/glx/singlepix.c
+++ b/GL/glx/singlepix.c
@@ -195,7 +195,7 @@ int __glXDisp_GetPolygonStipple(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+static int GetSeparableFilter(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
 {
     GLint compsize, compsize2;
     GLenum format, type, target;
@@ -206,12 +206,11 @@ int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
     char *answer, answerBuffer[200];
     GLint width=0, height=0;
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     format = *(GLenum *)(pc + 4);
     type = *(GLenum *)(pc + 8);
     target = *(GLenum *)(pc + 0);
@@ -220,8 +219,8 @@ int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
     /* target must be SEPARABLE_2D, however I guess we can let the GL
        barf on this one.... */
 
-    CALL_GetConvolutionParameteriv( GET_DISPATCH(), (target, GL_CONVOLUTION_WIDTH, &width) );
-    CALL_GetConvolutionParameteriv( GET_DISPATCH(), (target, GL_CONVOLUTION_HEIGHT, &height) );
+    CALL_GetConvolutionParameteriv(GET_DISPATCH(), (target, GL_CONVOLUTION_WIDTH, &width));
+    CALL_GetConvolutionParameteriv(GET_DISPATCH(), (target, GL_CONVOLUTION_HEIGHT, &height));
     /*
      * The two queries above might fail if we're in a state where queries
      * are illegal, but then width and height would still be zero anyway.
@@ -234,7 +233,7 @@ int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
     compsize = __GLX_PAD(compsize);
     compsize2 = __GLX_PAD(compsize2);
 
-    CALL_PixelStorei( GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes) );
+    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
     __GLX_GET_ANSWER_BUFFER(answer,cl,compsize + compsize2,1);
     __glXClearErrorOccured();
     CALL_GetSeparableFilter( GET_DISPATCH(), (
@@ -260,7 +259,22 @@ int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDisp_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+
+    return GetSeparableFilter(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
+
+int __glXDisp_GetSeparableFilterEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+
+    return GetSeparableFilter(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
+}
+
+static int GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc,
+				GLXContextTag tag)
 {
     GLint compsize;
     GLenum format, type, target;
@@ -271,22 +285,23 @@ int __glXDisp_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
     char *answer, answerBuffer[200];
     GLint width=0, height=0;
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     format = *(GLenum *)(pc + 4);
     type = *(GLenum *)(pc + 8);
     target = *(GLenum *)(pc + 0);
     swapBytes = *(GLboolean *)(pc + 12);
 
-    CALL_GetConvolutionParameteriv( GET_DISPATCH(), (target, GL_CONVOLUTION_WIDTH, &width) );
+    CALL_GetConvolutionParameteriv(GET_DISPATCH(), 
+				   (target, GL_CONVOLUTION_WIDTH, &width));
     if (target == GL_CONVOLUTION_1D) {
         height = 1;
     } else {
-	CALL_GetConvolutionParameteriv( GET_DISPATCH(), (target, GL_CONVOLUTION_HEIGHT, &height) );
+	CALL_GetConvolutionParameteriv(GET_DISPATCH(),
+				       (target, GL_CONVOLUTION_HEIGHT, &height));
     }
     /*
      * The two queries above might fail if we're in a state where queries
@@ -295,7 +310,7 @@ int __glXDisp_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
     compsize = __glGetTexImage_size(target,1,format,type,width,height,1);
     if (compsize < 0) compsize = 0;
 
-    CALL_PixelStorei( GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes) );
+    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
     __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
     __glXClearErrorOccured();
     CALL_GetConvolutionFilter( GET_DISPATCH(), (
@@ -319,7 +334,21 @@ int __glXDisp_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDisp_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+int __glXDisp_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+
+    return GetConvolutionFilter(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
+
+int __glXDisp_GetConvolutionFilterEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+
+    return GetConvolutionFilter(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
+}
+
+static int GetHistogram(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
 {
     GLint compsize;
     GLenum format, type, target;
@@ -330,19 +359,19 @@ int __glXDisp_GetHistogram(__GLXclientState *cl, GLbyte *pc)
     char *answer, answerBuffer[200];
     GLint width=0;
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     format = *(GLenum *)(pc + 4);
     type = *(GLenum *)(pc + 8);
     target = *(GLenum *)(pc + 0);
     swapBytes = *(GLboolean *)(pc + 12);
     reset = *(GLboolean *)(pc + 13);
 
-    CALL_GetHistogramParameteriv( GET_DISPATCH(), (target, GL_HISTOGRAM_WIDTH, &width) );
+    CALL_GetHistogramParameteriv(GET_DISPATCH(),
+				 (target, GL_HISTOGRAM_WIDTH, &width));
     /*
      * The one query above might fail if we're in a state where queries
      * are illegal, but then width would still be zero anyway.
@@ -350,10 +379,10 @@ int __glXDisp_GetHistogram(__GLXclientState *cl, GLbyte *pc)
     compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
     if (compsize < 0) compsize = 0;
 
-    CALL_PixelStorei( GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes) );
+    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
     __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
     __glXClearErrorOccured();
-    CALL_GetHistogram( GET_DISPATCH(), (target, reset, format, type, answer) );
+    CALL_GetHistogram(GET_DISPATCH(), (target, reset, format, type, answer));
 
     if (__glXErrorOccured()) {
 	__GLX_BEGIN_REPLY(0);
@@ -368,7 +397,21 @@ int __glXDisp_GetHistogram(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDisp_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+int __glXDisp_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+
+    return GetHistogram(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
+
+int __glXDisp_GetHistogramEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+
+    return GetHistogram(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
+}
+
+static int GetMinmax(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
 {
     GLint compsize;
     GLenum format, type, target;
@@ -378,12 +421,11 @@ int __glXDisp_GetMinmax(__GLXclientState *cl, GLbyte *pc)
     int error;
     char *answer, answerBuffer[200];
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     format = *(GLenum *)(pc + 4);
     type = *(GLenum *)(pc + 8);
     target = *(GLenum *)(pc + 0);
@@ -393,10 +435,10 @@ int __glXDisp_GetMinmax(__GLXclientState *cl, GLbyte *pc)
     compsize = __glGetTexImage_size(target,1,format,type,2,1,1);
     if (compsize < 0) compsize = 0;
 
-    CALL_PixelStorei( GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes) );
+    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
     __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
     __glXClearErrorOccured();
-    CALL_GetMinmax( GET_DISPATCH(), (target, reset, format, type, answer) );
+    CALL_GetMinmax(GET_DISPATCH(), (target, reset, format, type, answer));
 
     if (__glXErrorOccured()) {
 	__GLX_BEGIN_REPLY(0);
@@ -410,7 +452,21 @@ int __glXDisp_GetMinmax(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDisp_GetColorTable(__GLXclientState *cl, GLbyte *pc)
+int __glXDisp_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+
+    return GetMinmax(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
+
+int __glXDisp_GetMinmaxEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+
+    return GetMinmax(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
+}
+
+static int GetColorTable(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
 {
     GLint compsize;
     GLenum format, type, target;
@@ -421,18 +477,18 @@ int __glXDisp_GetColorTable(__GLXclientState *cl, GLbyte *pc)
     char *answer, answerBuffer[200];
     GLint width=0;
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     target = *(GLenum *)(pc + 0);
     format = *(GLenum *)(pc + 4);
     type = *(GLenum *)(pc + 8);
     swapBytes = *(GLboolean *)(pc + 12);
 
-    CALL_GetColorTableParameteriv( GET_DISPATCH(), (target, GL_COLOR_TABLE_WIDTH, &width) );
+    CALL_GetColorTableParameteriv(GET_DISPATCH(), 
+				  (target, GL_COLOR_TABLE_WIDTH, &width));
     /*
      * The one query above might fail if we're in a state where queries
      * are illegal, but then width would still be zero anyway.
@@ -440,7 +496,7 @@ int __glXDisp_GetColorTable(__GLXclientState *cl, GLbyte *pc)
     compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
     if (compsize < 0) compsize = 0;
 
-    CALL_PixelStorei( GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes) );
+    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
     __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
     __glXClearErrorOccured();
     CALL_GetColorTable( GET_DISPATCH(), (
@@ -463,55 +519,16 @@ int __glXDisp_GetColorTable(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDisp_GetColorTableSGI(__GLXclientState *cl, GLbyte *pc)
+int __glXDisp_GetColorTable(__GLXclientState *cl, GLbyte *pc)
 {
-    GLint compsize;
-    GLenum format, type, target;
-    GLboolean swapBytes;
-    __GLXcontext *cx;
-    ClientPtr client = cl->client;
-    int error;
-    char *answer, answerBuffer[200];
-    GLint width=0;
-
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
-    if (!cx) {
-	return error;
-    }
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    target = *(GLenum *)(pc + 0);
-    format = *(GLenum *)(pc + 4);
-    type = *(GLenum *)(pc + 8);
-    swapBytes = *(GLboolean *)(pc + 12);
-
-    CALL_GetColorTableParameterivSGI( GET_DISPATCH(), (target, GL_COLOR_TABLE_WIDTH, &width) );
-    /*
-     * The one query above might fail if we're in a state where queries
-     * are illegal, but then width would still be zero anyway.
-     */
-    compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
-    if (compsize < 0) compsize = 0;
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
 
-    CALL_PixelStorei( GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes) );
-    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-    __glXClearErrorOccured();
-    CALL_GetColorTableSGI( GET_DISPATCH(), (
-		  *(GLenum   *)(pc + 0),
-		  *(GLenum   *)(pc + 4),
-		  *(GLenum   *)(pc + 8),
-		  answer
-		  ) );
+    return GetColorTable(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
 
-    if (__glXErrorOccured()) {
-	__GLX_BEGIN_REPLY(0);
-	__GLX_SEND_HEADER();
-    } else {
-	__GLX_BEGIN_REPLY(compsize);
-	((xGLXGetColorTableReply *)&__glXReply)->width = width;
-	__GLX_SEND_HEADER();
-	__GLX_SEND_VOID_ARRAY(compsize);
-    }
+int __glXDisp_GetColorTableSGI(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
 
-    return Success;
+    return GetColorTable(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
 }
diff --git a/GL/glx/singlepixswap.c b/GL/glx/singlepixswap.c
index c2e06d13d..032b42765 100644
--- a/GL/glx/singlepixswap.c
+++ b/GL/glx/singlepixswap.c
@@ -219,7 +219,7 @@ int __glXDispSwap_GetPolygonStipple(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDispSwap_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+static int GetSeparableFilter(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
 {
     GLint compsize, compsize2;
     GLenum format, type, target;
@@ -231,12 +231,11 @@ int __glXDispSwap_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
     char *answer, answerBuffer[200];
     GLint width=0, height=0;
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     __GLX_SWAP_INT(pc+0);
     __GLX_SWAP_INT(pc+4);
     __GLX_SWAP_INT(pc+8);
@@ -291,7 +290,21 @@ int __glXDispSwap_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDispSwap_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+int __glXDispSwap_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+
+    return GetSeparableFilter(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
+
+int __glXDispSwap_GetSeparableFilterEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+
+    return GetSeparableFilter(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
+}
+
+static int GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
 {
     GLint compsize;
     GLenum format, type, target;
@@ -303,12 +316,11 @@ int __glXDispSwap_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
     char *answer, answerBuffer[200];
     GLint width=0, height=0;
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     __GLX_SWAP_INT(pc+0);
     __GLX_SWAP_INT(pc+4);
     __GLX_SWAP_INT(pc+8);
@@ -357,7 +369,21 @@ int __glXDispSwap_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDispSwap_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+int __glXDispSwap_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+
+    return GetConvolutionFilter(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
+
+int __glXDispSwap_GetConvolutionFilterEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+
+    return GetConvolutionFilter(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
+}
+
+static int GetHistogram(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
 {
     GLint compsize;
     GLenum format, type, target;
@@ -369,12 +395,11 @@ int __glXDispSwap_GetHistogram(__GLXclientState *cl, GLbyte *pc)
     char *answer, answerBuffer[200];
     GLint width=0;
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     __GLX_SWAP_INT(pc+0);
     __GLX_SWAP_INT(pc+4);
     __GLX_SWAP_INT(pc+8);
@@ -412,7 +437,21 @@ int __glXDispSwap_GetHistogram(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDispSwap_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+int __glXDispSwap_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+
+    return GetHistogram(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
+
+int __glXDispSwap_GetHistogramEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+
+    return GetHistogram(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
+}
+
+static int GetMinmax(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
 {
     GLint compsize;
     GLenum format, type, target;
@@ -423,12 +462,11 @@ int __glXDispSwap_GetMinmax(__GLXclientState *cl, GLbyte *pc)
     __GLX_DECLARE_SWAP_VARIABLES;
     char *answer, answerBuffer[200];
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     __GLX_SWAP_INT(pc+0);
     __GLX_SWAP_INT(pc+4);
     __GLX_SWAP_INT(pc+8);
@@ -459,7 +497,21 @@ int __glXDispSwap_GetMinmax(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDispSwap_GetColorTable(__GLXclientState *cl, GLbyte *pc)
+int __glXDispSwap_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
+
+    return GetMinmax(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
+
+int __glXDispSwap_GetMinmaxEXT(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
+
+    return GetMinmax(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
+}
+
+static int GetColorTable(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
 {
     GLint compsize;
     GLenum format, type, target;
@@ -471,12 +523,11 @@ int __glXDispSwap_GetColorTable(__GLXclientState *cl, GLbyte *pc)
     char *answer, answerBuffer[200];
     GLint width=0;
 
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    cx = __glXForceCurrent(cl, tag, &error);
     if (!cx) {
 	return error;
     }
 
-    pc += __GLX_SINGLE_HDR_SIZE;
     __GLX_SWAP_INT(pc+0);
     __GLX_SWAP_INT(pc+4);
     __GLX_SWAP_INT(pc+8);
@@ -518,61 +569,16 @@ int __glXDispSwap_GetColorTable(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
-int __glXDispSwap_GetColorTableSGI(__GLXclientState *cl, GLbyte *pc)
+int __glXDispSwap_GetColorTable(__GLXclientState *cl, GLbyte *pc)
 {
-    GLint compsize;
-    GLenum format, type, target;
-    GLboolean swapBytes;
-    __GLXcontext *cx;
-    ClientPtr client = cl->client;
-    int error;
-    __GLX_DECLARE_SWAP_VARIABLES;
-    char *answer, answerBuffer[200];
-    GLint width=0;
-
-    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
-    if (!cx) {
-	return error;
-    }
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    __GLX_SWAP_INT(pc+0);
-    __GLX_SWAP_INT(pc+4);
-    __GLX_SWAP_INT(pc+8);
-
-    format = *(GLenum *)(pc + 4);
-    type = *(GLenum *)(pc + 8);
-    target = *(GLenum *)(pc + 0);
-    swapBytes = *(GLboolean *)(pc + 12);
-
-    CALL_GetColorTableParameterivSGI( GET_DISPATCH(), (target, GL_COLOR_TABLE_WIDTH, &width) );
-    /*
-     * The one query above might fail if we're in a state where queries
-     * are illegal, but then width would still be zero anyway.
-     */
-    compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
-    if (compsize < 0) compsize = 0;
+    const GLXContextTag tag = __GLX_GET_SINGLE_CONTEXT_TAG(pc);
 
-    CALL_PixelStorei( GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes) );
-    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-    __glXClearErrorOccured();
-    CALL_GetColorTableSGI( GET_DISPATCH(), (
-		  *(GLenum   *)(pc + 0),
-		  *(GLenum   *)(pc + 4),
-		  *(GLenum   *)(pc + 8),
-		  answer
-		  ) );
+    return GetColorTable(cl, pc + __GLX_SINGLE_HDR_SIZE, tag);
+}
 
-    if (__glXErrorOccured()) {
-	__GLX_BEGIN_REPLY(0);
-	__GLX_SWAP_REPLY_HEADER();
-    } else {
-	__GLX_BEGIN_REPLY(compsize);
-	__GLX_SWAP_REPLY_HEADER();
-	__GLX_SWAP_INT(&width);
-	((xGLXGetColorTableReply *)&__glXReply)->width = width;
-	__GLX_SEND_VOID_ARRAY(compsize);
-    }
+int __glXDispSwap_GetColorTableSGI(__GLXclientState *cl, GLbyte *pc)
+{
+    const GLXContextTag tag = __GLX_GET_VENDPRIV_CONTEXT_TAG(pc);
 
-    return Success;
+    return GetColorTable(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
 }