indirect.h now pulls double duty. Depending on how

GENERATE_GLX_PROTOCOL_FUNCTIONS and the glxproto_* macros are set, it
will either generate prototypes are generate the functions.  Right now
only g_render.c should have GENERATE_GLX_PROTOCOL_FUNCTIONS set.

This cuts out about 2500 lines of code.

3 files changed, 708 insertions, 3561 deletions

diff --git a/xc/lib/GL/glx/g_render.c b/xc/lib/GL/glx/g_render.c
index 6212c5fb9..cd6646bac 100644
--- a/xc/lib/GL/glx/g_render.c
+++ b/xc/lib/GL/glx/g_render.c
@@ -117,6 +117,15 @@
  * functions 'glFoo3fvEXT' and 'glFoo3fEXT'.
  */
 
+#define glxproto_void(name, rop) \
+   void __indirect_gl ## name (void) \
+   { \
+	__GLX_DECLARE_VARIABLES(); \
+	__GLX_LOAD_VARIABLES(); \
+	__GLX_BEGIN(rop, 4); \
+	__GLX_END(4); \
+   }
+
 #define glxproto_Cv(name, rop, type, count) \
    void __indirect_gl ## name (const type * v) \
    { \
@@ -135,6 +144,23 @@
       __GLX_END(cmdlen); \
    }
 
+#define glxproto_Cv_transpose(name, rop, type, w) \
+   void __indirect_gl ## name (const type * v) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      type t[ w * w ]; unsigned i, j; \
+      for (i = 0; i < w; i++) { \
+	 for (j = 0; j < w; j++) { \
+	    t[i*w+j] = v[j*w+i]; \
+	 } \
+      } \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = RENDER_SIZE(type, (w * w)); \
+      __GLX_BEGIN(rop, cmdlen); \
+      __GLX_PUT_ ## type ## _ARRAY(4, t, (w * w)); \
+      __GLX_END(cmdlen); \
+   }
+
 #define glxproto_1s(name, rop, type) \
    void __indirect_gl ## name (type v1) \
    { \
@@ -146,6 +172,18 @@
       __GLX_END(cmdlen); \
    }
 
+#define glxproto_2s(name, rop, type) \
+   void __indirect_gl ## name (type v1, type v2) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = RENDER_SIZE(type, 2); \
+      __GLX_BEGIN(rop, cmdlen); \
+      __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v1); \
+      __GLX_PUT_ ## type (4 + (1 * type ## _SIZE), v2); \
+      __GLX_END(cmdlen); \
+   }
+
 #define glxproto_3s(name, rop, type) \
    void __indirect_gl ## name (type v1, type v2, type v3) \
    { \
@@ -173,6 +211,22 @@
       __GLX_END(cmdlen); \
    }
 
+#define glxproto_6s(name, rop, type) \
+   void __indirect_gl ## name (type v1, type v2, type v3, type v4, type v5, type v6) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = RENDER_SIZE(type, 6); \
+      __GLX_BEGIN(rop, cmdlen); \
+      __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v1); \
+      __GLX_PUT_ ## type (4 + (1 * type ## _SIZE), v2); \
+      __GLX_PUT_ ## type (4 + (2 * type ## _SIZE), v3); \
+      __GLX_PUT_ ## type (4 + (3 * type ## _SIZE), v4); \
+      __GLX_PUT_ ## type (4 + (4 * type ## _SIZE), v5); \
+      __GLX_PUT_ ## type (4 + (5 * type ## _SIZE), v6); \
+      __GLX_END(cmdlen); \
+   }
+
 #define glxproto_enum1_1s(name, rop, type) \
    void __indirect_gl ## name (GLenum e, type v1) \
    { \
@@ -190,931 +244,199 @@
       __GLX_END(cmdlen); \
    }
 
-#define glxproto_enum1_Vv(name, rop, type) \
-   void __indirect_gl ## name (GLenum pname, const type * v) \
+#define glxproto_enum1_1v(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, const type * v) \
    { \
       __GLX_DECLARE_VARIABLES(); \
       __GLX_LOAD_VARIABLES(); \
-      compsize = __gl ## name ## _size(pname); \
-      cmdlen = 4 + RENDER_SIZE(type, compsize); \
+      cmdlen = 4 + RENDER_SIZE(type, 1); \
       __GLX_BEGIN(rop, cmdlen); \
-      __GLX_PUT_LONG(4, pname); \
-      __GLX_PUT_ ## type ## _ARRAY(8, v, compsize); \
+      if (type ## _SIZE == 8) { \
+	 __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v[0]); \
+	 __GLX_PUT_LONG     (4 + (1 * type ## _SIZE), e); \
+      } else { \
+	 __GLX_PUT_LONG(4, e); \
+	 __GLX_PUT_ ## type (8 + (0 * type ## _SIZE), v[0]); \
+      } \
       __GLX_END(cmdlen); \
    }
 
-#define glxproto_1(name, rop, type) \
-   glxproto_1s(name,      rop, type) \
-   glxproto_Cv(name ## v, rop, type, 1)
-
-#define glxvendr_1(name, rop, type, VEN) \
-   glxproto_1s(name ## VEN,      rop, type) \
-   glxproto_Cv(name ## v ## VEN, rop, type, 1)
-
-#define glxproto_3(name, rop, type) \
-   glxproto_3s(name,      rop, type) \
-   glxproto_Cv(name ## v, rop, type, 3)
-
-#define glxproto_enum1_V(name, rop, type) \
-   glxproto_enum1_1s(name,      rop,      type) \
-   glxproto_enum1_Vv(name ## v, rop ## v, type)
-
-#define glxvendr_enum1_V(name, rop, type, VEN) \
-   glxproto_enum1_1s(name ## VEN,      rop ## VEN,      type) \
-   glxproto_enum1_Vv(name ## v ## VEN, rop ## v ## VEN, type)
-
-void glCallList(GLuint list)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_CallList,8);
-	__GLX_PUT_LONG(4,list);
-	__GLX_END(8);
-}
-
-void glListBase(GLuint base)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ListBase,8);
-	__GLX_PUT_LONG(4,base);
-	__GLX_END(8);
-}
-
-void glBegin(GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Begin,8);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_END(8);
-}
-
-void glColor3b(GLbyte red, GLbyte green, GLbyte blue)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3bv,8);
-	__GLX_PUT_CHAR(4,red);
-	__GLX_PUT_CHAR(5,green);
-	__GLX_PUT_CHAR(6,blue);
-	__GLX_END(8);
-}
-
-void glColor3bv(const GLbyte *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3bv,8);
-	__GLX_PUT_CHAR(4,v[0]);
-	__GLX_PUT_CHAR(5,v[1]);
-	__GLX_PUT_CHAR(6,v[2]);
-	__GLX_END(8);
-}
-
-void glColor3d(GLdouble red, GLdouble green, GLdouble blue)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3dv,28);
-	__GLX_PUT_DOUBLE(4,red);
-	__GLX_PUT_DOUBLE(12,green);
-	__GLX_PUT_DOUBLE(20,blue);
-	__GLX_END(28);
-}
-
-void glColor3dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3dv,28);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_END(28);
-}
-
-void glColor3f(GLfloat red, GLfloat green, GLfloat blue)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3fv,16);
-	__GLX_PUT_FLOAT(4,red);
-	__GLX_PUT_FLOAT(8,green);
-	__GLX_PUT_FLOAT(12,blue);
-	__GLX_END(16);
-}
-
-void glColor3fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3fv,16);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_PUT_FLOAT(12,v[2]);
-	__GLX_END(16);
-}
-
-void glColor3i(GLint red, GLint green, GLint blue)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3iv,16);
-	__GLX_PUT_LONG(4,red);
-	__GLX_PUT_LONG(8,green);
-	__GLX_PUT_LONG(12,blue);
-	__GLX_END(16);
-}
-
-void glColor3iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3iv,16);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_END(16);
-}
-
-void glColor3s(GLshort red, GLshort green, GLshort blue)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3sv,12);
-	__GLX_PUT_SHORT(4,red);
-	__GLX_PUT_SHORT(6,green);
-	__GLX_PUT_SHORT(8,blue);
-	__GLX_END(12);
-}
-
-void glColor3sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3sv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_END(12);
-}
-
-void glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3ubv,8);
-	__GLX_PUT_CHAR(4,red);
-	__GLX_PUT_CHAR(5,green);
-	__GLX_PUT_CHAR(6,blue);
-	__GLX_END(8);
-}
-
-void glColor3ubv(const GLubyte *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3ubv,8);
-	__GLX_PUT_CHAR(4,v[0]);
-	__GLX_PUT_CHAR(5,v[1]);
-	__GLX_PUT_CHAR(6,v[2]);
-	__GLX_END(8);
-}
-
-void glColor3ui(GLuint red, GLuint green, GLuint blue)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3uiv,16);
-	__GLX_PUT_LONG(4,red);
-	__GLX_PUT_LONG(8,green);
-	__GLX_PUT_LONG(12,blue);
-	__GLX_END(16);
-}
-
-void glColor3uiv(const GLuint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3uiv,16);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_END(16);
-}
-
-void glColor3us(GLushort red, GLushort green, GLushort blue)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3usv,12);
-	__GLX_PUT_SHORT(4,red);
-	__GLX_PUT_SHORT(6,green);
-	__GLX_PUT_SHORT(8,blue);
-	__GLX_END(12);
-}
-
-void glColor3usv(const GLushort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color3usv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_END(12);
-}
-
-void glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4bv,8);
-	__GLX_PUT_CHAR(4,red);
-	__GLX_PUT_CHAR(5,green);
-	__GLX_PUT_CHAR(6,blue);
-	__GLX_PUT_CHAR(7,alpha);
-	__GLX_END(8);
-}
-
-void glColor4bv(const GLbyte *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4bv,8);
-	__GLX_PUT_CHAR(4,v[0]);
-	__GLX_PUT_CHAR(5,v[1]);
-	__GLX_PUT_CHAR(6,v[2]);
-	__GLX_PUT_CHAR(7,v[3]);
-	__GLX_END(8);
-}
-
-void glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4dv,36);
-	__GLX_PUT_DOUBLE(4,red);
-	__GLX_PUT_DOUBLE(12,green);
-	__GLX_PUT_DOUBLE(20,blue);
-	__GLX_PUT_DOUBLE(28,alpha);
-	__GLX_END(36);
-}
-
-void glColor4dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4dv,36);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_PUT_DOUBLE(28,v[3]);
-	__GLX_END(36);
-}
-
-void glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4fv,20);
-	__GLX_PUT_FLOAT(4,red);
-	__GLX_PUT_FLOAT(8,green);
-	__GLX_PUT_FLOAT(12,blue);
-	__GLX_PUT_FLOAT(16,alpha);
-	__GLX_END(20);
-}
-
-void glColor4fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4fv,20);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_PUT_FLOAT(12,v[2]);
-	__GLX_PUT_FLOAT(16,v[3]);
-	__GLX_END(20);
-}
-
-void glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4iv,20);
-	__GLX_PUT_LONG(4,red);
-	__GLX_PUT_LONG(8,green);
-	__GLX_PUT_LONG(12,blue);
-	__GLX_PUT_LONG(16,alpha);
-	__GLX_END(20);
-}
-
-void glColor4iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4iv,20);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_PUT_LONG(16,v[3]);
-	__GLX_END(20);
-}
-
-void glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4sv,12);
-	__GLX_PUT_SHORT(4,red);
-	__GLX_PUT_SHORT(6,green);
-	__GLX_PUT_SHORT(8,blue);
-	__GLX_PUT_SHORT(10,alpha);
-	__GLX_END(12);
-}
-
-void glColor4sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4sv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_PUT_SHORT(10,v[3]);
-	__GLX_END(12);
-}
-
-void glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4ubv,8);
-	__GLX_PUT_CHAR(4,red);
-	__GLX_PUT_CHAR(5,green);
-	__GLX_PUT_CHAR(6,blue);
-	__GLX_PUT_CHAR(7,alpha);
-	__GLX_END(8);
-}
-
-void glColor4ubv(const GLubyte *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4ubv,8);
-	__GLX_PUT_CHAR(4,v[0]);
-	__GLX_PUT_CHAR(5,v[1]);
-	__GLX_PUT_CHAR(6,v[2]);
-	__GLX_PUT_CHAR(7,v[3]);
-	__GLX_END(8);
-}
-
-void glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4uiv,20);
-	__GLX_PUT_LONG(4,red);
-	__GLX_PUT_LONG(8,green);
-	__GLX_PUT_LONG(12,blue);
-	__GLX_PUT_LONG(16,alpha);
-	__GLX_END(20);
-}
-
-void glColor4uiv(const GLuint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4uiv,20);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_PUT_LONG(16,v[3]);
-	__GLX_END(20);
-}
-
-void glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4usv,12);
-	__GLX_PUT_SHORT(4,red);
-	__GLX_PUT_SHORT(6,green);
-	__GLX_PUT_SHORT(8,blue);
-	__GLX_PUT_SHORT(10,alpha);
-	__GLX_END(12);
-}
-
-void glColor4usv(const GLushort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Color4usv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_PUT_SHORT(10,v[3]);
-	__GLX_END(12);
-}
-
-glxproto_1(FogCoordf, X_GLrop_FogCoordfv, GLfloat)
-glxproto_1(FogCoordd, X_GLrop_FogCoorddv, GLdouble)
-
-glxproto_3(SecondaryColor3b,  X_GLrop_SecondaryColor3bv,  GLbyte)
-glxproto_3(SecondaryColor3s,  X_GLrop_SecondaryColor3sv,  GLshort)
-glxproto_3(SecondaryColor3i,  X_GLrop_SecondaryColor3iv,  GLint)
-glxproto_3(SecondaryColor3ub, X_GLrop_SecondaryColor3ubv, GLubyte)
-glxproto_3(SecondaryColor3us, X_GLrop_SecondaryColor3usv, GLushort)
-glxproto_3(SecondaryColor3ui, X_GLrop_SecondaryColor3uiv, GLuint)
-glxproto_3(SecondaryColor3f,  X_GLrop_SecondaryColor3fv,  GLfloat)
-glxproto_3(SecondaryColor3d,  X_GLrop_SecondaryColor3dv,  GLdouble)
-
-void glEdgeFlag(GLboolean flag)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EdgeFlagv,8);
-	__GLX_PUT_CHAR(4,flag);
-	__GLX_END(8);
-}
-
-void glEdgeFlagv(const GLboolean *flag)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EdgeFlagv,8);
-	__GLX_PUT_CHAR(4,flag[0]);
-	__GLX_END(8);
-}
-
-void glEnd(void)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_End,4);
-	__GLX_END(4);
-}
-
-void glIndexd(GLdouble c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexdv,12);
-	__GLX_PUT_DOUBLE(4,c);
-	__GLX_END(12);
-}
-
-void glIndexdv(const GLdouble *c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexdv,12);
-	__GLX_PUT_DOUBLE(4,c[0]);
-	__GLX_END(12);
-}
-
-void glIndexf(GLfloat c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexfv,8);
-	__GLX_PUT_FLOAT(4,c);
-	__GLX_END(8);
-}
-
-void glIndexfv(const GLfloat *c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexfv,8);
-	__GLX_PUT_FLOAT(4,c[0]);
-	__GLX_END(8);
-}
-
-void glIndexi(GLint c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexiv,8);
-	__GLX_PUT_LONG(4,c);
-	__GLX_END(8);
-}
-
-void glIndexiv(const GLint *c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexiv,8);
-	__GLX_PUT_LONG(4,c[0]);
-	__GLX_END(8);
-}
-
-void glIndexs(GLshort c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexsv,8);
-	__GLX_PUT_SHORT(4,c);
-	__GLX_END(8);
-}
-
-void glIndexsv(const GLshort *c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexsv,8);
-	__GLX_PUT_SHORT(4,c[0]);
-	__GLX_END(8);
-}
-
-void glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3bv,8);
-	__GLX_PUT_CHAR(4,nx);
-	__GLX_PUT_CHAR(5,ny);
-	__GLX_PUT_CHAR(6,nz);
-	__GLX_END(8);
-}
-
-void glNormal3bv(const GLbyte *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3bv,8);
-	__GLX_PUT_CHAR(4,v[0]);
-	__GLX_PUT_CHAR(5,v[1]);
-	__GLX_PUT_CHAR(6,v[2]);
-	__GLX_END(8);
-}
-
-void glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3dv,28);
-	__GLX_PUT_DOUBLE(4,nx);
-	__GLX_PUT_DOUBLE(12,ny);
-	__GLX_PUT_DOUBLE(20,nz);
-	__GLX_END(28);
-}
-
-void glNormal3dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3dv,28);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_END(28);
-}
-
-void glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3fv,16);
-	__GLX_PUT_FLOAT(4,nx);
-	__GLX_PUT_FLOAT(8,ny);
-	__GLX_PUT_FLOAT(12,nz);
-	__GLX_END(16);
-}
-
-void glNormal3fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3fv,16);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_PUT_FLOAT(12,v[2]);
-	__GLX_END(16);
-}
-
-void glNormal3i(GLint nx, GLint ny, GLint nz)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3iv,16);
-	__GLX_PUT_LONG(4,nx);
-	__GLX_PUT_LONG(8,ny);
-	__GLX_PUT_LONG(12,nz);
-	__GLX_END(16);
-}
-
-void glNormal3iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3iv,16);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_END(16);
-}
-
-void glNormal3s(GLshort nx, GLshort ny, GLshort nz)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3sv,12);
-	__GLX_PUT_SHORT(4,nx);
-	__GLX_PUT_SHORT(6,ny);
-	__GLX_PUT_SHORT(8,nz);
-	__GLX_END(12);
-}
-
-void glNormal3sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Normal3sv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_END(12);
-}
-
-void glRasterPos2d(GLdouble x, GLdouble y)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos2dv,20);
-	__GLX_PUT_DOUBLE(4,x);
-	__GLX_PUT_DOUBLE(12,y);
-	__GLX_END(20);
-}
-
-void glRasterPos2dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos2dv,20);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_END(20);
-}
-
-void glRasterPos2f(GLfloat x, GLfloat y)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos2fv,12);
-	__GLX_PUT_FLOAT(4,x);
-	__GLX_PUT_FLOAT(8,y);
-	__GLX_END(12);
-}
-
-void glRasterPos2fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos2fv,12);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_END(12);
-}
-
-void glRasterPos2i(GLint x, GLint y)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos2iv,12);
-	__GLX_PUT_LONG(4,x);
-	__GLX_PUT_LONG(8,y);
-	__GLX_END(12);
-}
-
-void glRasterPos2iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos2iv,12);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_END(12);
-}
-
-void glRasterPos2s(GLshort x, GLshort y)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos2sv,8);
-	__GLX_PUT_SHORT(4,x);
-	__GLX_PUT_SHORT(6,y);
-	__GLX_END(8);
-}
-
-void glRasterPos2sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos2sv,8);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_END(8);
-}
-
-void glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos3dv,28);
-	__GLX_PUT_DOUBLE(4,x);
-	__GLX_PUT_DOUBLE(12,y);
-	__GLX_PUT_DOUBLE(20,z);
-	__GLX_END(28);
-}
-
-void glRasterPos3dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos3dv,28);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_END(28);
-}
-
-void glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos3fv,16);
-	__GLX_PUT_FLOAT(4,x);
-	__GLX_PUT_FLOAT(8,y);
-	__GLX_PUT_FLOAT(12,z);
-	__GLX_END(16);
-}
-
-void glRasterPos3fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos3fv,16);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_PUT_FLOAT(12,v[2]);
-	__GLX_END(16);
-}
-
-void glRasterPos3i(GLint x, GLint y, GLint z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos3iv,16);
-	__GLX_PUT_LONG(4,x);
-	__GLX_PUT_LONG(8,y);
-	__GLX_PUT_LONG(12,z);
-	__GLX_END(16);
-}
-
-void glRasterPos3iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos3iv,16);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_END(16);
-}
-
-void glRasterPos3s(GLshort x, GLshort y, GLshort z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos3sv,12);
-	__GLX_PUT_SHORT(4,x);
-	__GLX_PUT_SHORT(6,y);
-	__GLX_PUT_SHORT(8,z);
-	__GLX_END(12);
-}
-
-void glRasterPos3sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos3sv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_END(12);
-}
-
-void glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos4dv,36);
-	__GLX_PUT_DOUBLE(4,x);
-	__GLX_PUT_DOUBLE(12,y);
-	__GLX_PUT_DOUBLE(20,z);
-	__GLX_PUT_DOUBLE(28,w);
-	__GLX_END(36);
-}
+#define glxproto_enum1_2s(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, type v1, type v2) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = 4 + RENDER_SIZE(type, 2); \
+      __GLX_BEGIN(rop, cmdlen); \
+      if (type ## _SIZE == 8) { \
+	 __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v1); \
+	 __GLX_PUT_ ## type (4 + (1 * type ## _SIZE), v2); \
+	 __GLX_PUT_LONG     (4 + (2 * type ## _SIZE), e); \
+      } else { \
+	 __GLX_PUT_LONG(4, e); \
+	 __GLX_PUT_ ## type (8 + (0 * type ## _SIZE), v1); \
+	 __GLX_PUT_ ## type (8 + (1 * type ## _SIZE), v2); \
+      } \
+      __GLX_END(cmdlen); \
+   }
 
-void glRasterPos4dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos4dv,36);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_PUT_DOUBLE(28,v[3]);
-	__GLX_END(36);
-}
+#define glxproto_enum1_2v(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, const type * v) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = 4 + RENDER_SIZE(type, 2); \
+      __GLX_BEGIN(rop, cmdlen); \
+      if (type ## _SIZE == 8) { \
+	 __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v[0]); \
+	 __GLX_PUT_ ## type (4 + (1 * type ## _SIZE), v[1]); \
+	 __GLX_PUT_LONG     (4 + (2 * type ## _SIZE), e); \
+      } else { \
+	 __GLX_PUT_LONG(4, e); \
+	 __GLX_PUT_ ## type (8 + (0 * type ## _SIZE), v[0]); \
+	 __GLX_PUT_ ## type (8 + (1 * type ## _SIZE), v[1]); \
+      } \
+      __GLX_END(cmdlen); \
+   }
 
-void glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos4fv,20);
-	__GLX_PUT_FLOAT(4,x);
-	__GLX_PUT_FLOAT(8,y);
-	__GLX_PUT_FLOAT(12,z);
-	__GLX_PUT_FLOAT(16,w);
-	__GLX_END(20);
-}
+#define glxproto_enum1_3s(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, type v1, type v2, type v3) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = 4 + RENDER_SIZE(type, 3); \
+      __GLX_BEGIN(rop, cmdlen); \
+      if (type ## _SIZE == 8) { \
+	 __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v1); \
+	 __GLX_PUT_ ## type (4 + (1 * type ## _SIZE), v2); \
+	 __GLX_PUT_ ## type (4 + (2 * type ## _SIZE), v3); \
+	 __GLX_PUT_LONG     (4 + (3 * type ## _SIZE), e); \
+      } else { \
+	 __GLX_PUT_LONG(4, e); \
+	 __GLX_PUT_ ## type (8 + (0 * type ## _SIZE), v1); \
+	 __GLX_PUT_ ## type (8 + (1 * type ## _SIZE), v2); \
+	 __GLX_PUT_ ## type (8 + (2 * type ## _SIZE), v3); \
+      } \
+      __GLX_END(cmdlen); \
+   }
 
-void glRasterPos4fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos4fv,20);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_PUT_FLOAT(12,v[2]);
-	__GLX_PUT_FLOAT(16,v[3]);
-	__GLX_END(20);
-}
+#define glxproto_enum1_3v(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, const type * v) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = 4 + RENDER_SIZE(type, 3); \
+      __GLX_BEGIN(rop, cmdlen); \
+      if (type ## _SIZE == 8) { \
+	 __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v[0]); \
+	 __GLX_PUT_ ## type (4 + (1 * type ## _SIZE), v[1]); \
+	 __GLX_PUT_ ## type (4 + (2 * type ## _SIZE), v[2]); \
+	 __GLX_PUT_LONG     (4 + (3 * type ## _SIZE), e); \
+      } else { \
+	 __GLX_PUT_LONG(4, e); \
+	 __GLX_PUT_ ## type (8 + (0 * type ## _SIZE), v[0]); \
+	 __GLX_PUT_ ## type (8 + (1 * type ## _SIZE), v[1]); \
+	 __GLX_PUT_ ## type (8 + (2 * type ## _SIZE), v[2]); \
+      } \
+      __GLX_END(cmdlen); \
+   }
 
-void glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos4iv,20);
-	__GLX_PUT_LONG(4,x);
-	__GLX_PUT_LONG(8,y);
-	__GLX_PUT_LONG(12,z);
-	__GLX_PUT_LONG(16,w);
-	__GLX_END(20);
-}
+#define glxproto_enum1_4s(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, type v1, type v2, type v3, type v4) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = 4 + RENDER_SIZE(type, 4); \
+      __GLX_BEGIN(rop, cmdlen); \
+      if (type ## _SIZE == 8) { \
+	 __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v1); \
+	 __GLX_PUT_ ## type (4 + (1 * type ## _SIZE), v2); \
+	 __GLX_PUT_ ## type (4 + (2 * type ## _SIZE), v3); \
+	 __GLX_PUT_ ## type (4 + (3 * type ## _SIZE), v4); \
+	 __GLX_PUT_LONG     (4 + (4 * type ## _SIZE), e); \
+      } else { \
+	 __GLX_PUT_LONG(4, e); \
+	 __GLX_PUT_ ## type (8 + (0 * type ## _SIZE), v1); \
+	 __GLX_PUT_ ## type (8 + (1 * type ## _SIZE), v2); \
+	 __GLX_PUT_ ## type (8 + (2 * type ## _SIZE), v3); \
+	 __GLX_PUT_ ## type (8 + (3 * type ## _SIZE), v4); \
+      } \
+      __GLX_END(cmdlen); \
+   }
 
-void glRasterPos4iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos4iv,20);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_PUT_LONG(16,v[3]);
-	__GLX_END(20);
-}
+#define glxproto_enum1_4v(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, const type * v) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = 4 + RENDER_SIZE(type, 4); \
+      __GLX_BEGIN(rop, cmdlen); \
+      if (type ## _SIZE == 8) { \
+	 __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v[0]); \
+	 __GLX_PUT_ ## type (4 + (1 * type ## _SIZE), v[1]); \
+	 __GLX_PUT_ ## type (4 + (2 * type ## _SIZE), v[2]); \
+	 __GLX_PUT_ ## type (4 + (3 * type ## _SIZE), v[3]); \
+	 __GLX_PUT_LONG     (4 + (4 * type ## _SIZE), e); \
+      } else { \
+	 __GLX_PUT_LONG(4, e); \
+	 __GLX_PUT_ ## type (8 + (0 * type ## _SIZE), v[0]); \
+	 __GLX_PUT_ ## type (8 + (1 * type ## _SIZE), v[1]); \
+	 __GLX_PUT_ ## type (8 + (2 * type ## _SIZE), v[2]); \
+	 __GLX_PUT_ ## type (8 + (3 * type ## _SIZE), v[3]); \
+      } \
+      __GLX_END(cmdlen); \
+   }
 
-void glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos4sv,12);
-	__GLX_PUT_SHORT(4,x);
-	__GLX_PUT_SHORT(6,y);
-	__GLX_PUT_SHORT(8,z);
-	__GLX_PUT_SHORT(10,w);
-	__GLX_END(12);
-}
+#define glxproto_enum1_Vv(name, rop, type) \
+   void __indirect_gl ## name (GLenum pname, const type * v) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      compsize = __gl ## name ## _size(pname); \
+      cmdlen = 4 + RENDER_SIZE(type, compsize); \
+      __GLX_BEGIN(rop, cmdlen); \
+      __GLX_PUT_LONG(4, pname); \
+      __GLX_PUT_ ## type ## _ARRAY(8, v, compsize); \
+      __GLX_END(cmdlen); \
+   }
+    
+#define glxproto_enum2_1s(name, rop, type) \
+   void __indirect_gl ## name (GLenum target, GLenum pname, type v1) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen = 8 + RENDER_SIZE(type, 1); \
+      __GLX_BEGIN(rop, cmdlen); \
+      if (type ## _SIZE == 8) { \
+	 __GLX_PUT_ ## type (4 + (0 * type ## _SIZE), v1); \
+	 __GLX_PUT_LONG     (4 + (1 * type ## _SIZE), target); \
+	 __GLX_PUT_LONG     (8 + (1 * type ## _SIZE), pname); \
+      } else { \
+	 __GLX_PUT_LONG(4, target); \
+	 __GLX_PUT_LONG(8, pname); \
+	 __GLX_PUT_ ## type (12 + (0 * type ## _SIZE), v1); \
+      } \
+      __GLX_END(cmdlen); \
+   }
 
-void glRasterPos4sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_RasterPos4sv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_PUT_SHORT(10,v[3]);
-	__GLX_END(12);
-}
+#define glxproto_enum2_Vv(name, rop, type) \
+   void __indirect_gl ## name (GLenum target, GLenum pname, const type * v) \
+   { \
+      __GLX_DECLARE_VARIABLES(); \
+      compsize = __gl ## name ## _size(pname); \
+      __GLX_LOAD_VARIABLES(); \
+      cmdlen =  8 + RENDER_SIZE(type, compsize); \
+      __GLX_BEGIN(rop, cmdlen); \
+      __GLX_PUT_LONG(4, target); \
+      __GLX_PUT_LONG(8, pname); \
+      __GLX_PUT_ ## type ## _ARRAY(12, v, compsize); \
+      __GLX_END(cmdlen); \
+   }
 
-void glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Rectdv,36);
-	__GLX_PUT_DOUBLE(4,x1);
-	__GLX_PUT_DOUBLE(12,y1);
-	__GLX_PUT_DOUBLE(20,x2);
-	__GLX_PUT_DOUBLE(28,y2);
-	__GLX_END(36);
-}
+#define GENERATE_GLX_PROTOCOL_FUNCTIONS
+#include "indirect.h"
 
-void glRectdv(const GLdouble *v1, const GLdouble *v2)
+void __indirect_glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -1126,19 +448,7 @@ void glRectdv(const GLdouble *v1, const GLdouble *v2)
 	__GLX_END(36);
 }
 
-void glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Rectfv,20);
-	__GLX_PUT_FLOAT(4,x1);
-	__GLX_PUT_FLOAT(8,y1);
-	__GLX_PUT_FLOAT(12,x2);
-	__GLX_PUT_FLOAT(16,y2);
-	__GLX_END(20);
-}
-
-void glRectfv(const GLfloat *v1, const GLfloat *v2)
+void __indirect_glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -1150,19 +460,7 @@ void glRectfv(const GLfloat *v1, const GLfloat *v2)
 	__GLX_END(20);
 }
 
-void glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Rectiv,20);
-	__GLX_PUT_LONG(4,x1);
-	__GLX_PUT_LONG(8,y1);
-	__GLX_PUT_LONG(12,x2);
-	__GLX_PUT_LONG(16,y2);
-	__GLX_END(20);
-}
-
-void glRectiv(const GLint *v1, const GLint *v2)
+void __indirect_glRectiv(const GLint *v1, const GLint *v2)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -1174,19 +472,7 @@ void glRectiv(const GLint *v1, const GLint *v2)
 	__GLX_END(20);
 }
 
-void glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Rectsv,12);
-	__GLX_PUT_SHORT(4,x1);
-	__GLX_PUT_SHORT(6,y1);
-	__GLX_PUT_SHORT(8,x2);
-	__GLX_PUT_SHORT(10,y2);
-	__GLX_END(12);
-}
-
-void glRectsv(const GLshort *v1, const GLshort *v2)
+void __indirect_glRectsv(const GLshort *v1, const GLshort *v2)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -1198,794 +484,7 @@ void glRectsv(const GLshort *v1, const GLshort *v2)
 	__GLX_END(12);
 }
 
-void glTexCoord1d(GLdouble s)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord1dv,12);
-	__GLX_PUT_DOUBLE(4,s);
-	__GLX_END(12);
-}
-
-void glTexCoord1dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord1dv,12);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_END(12);
-}
-
-void glTexCoord1f(GLfloat s)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord1fv,8);
-	__GLX_PUT_FLOAT(4,s);
-	__GLX_END(8);
-}
-
-void glTexCoord1fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord1fv,8);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_END(8);
-}
-
-void glTexCoord1i(GLint s)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord1iv,8);
-	__GLX_PUT_LONG(4,s);
-	__GLX_END(8);
-}
-
-void glTexCoord1iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord1iv,8);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_END(8);
-}
-
-void glTexCoord1s(GLshort s)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord1sv,8);
-	__GLX_PUT_SHORT(4,s);
-	__GLX_END(8);
-}
-
-void glTexCoord1sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord1sv,8);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_END(8);
-}
-
-void glTexCoord2d(GLdouble s, GLdouble t)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord2dv,20);
-	__GLX_PUT_DOUBLE(4,s);
-	__GLX_PUT_DOUBLE(12,t);
-	__GLX_END(20);
-}
-
-void glTexCoord2dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord2dv,20);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_END(20);
-}
-
-void glTexCoord2f(GLfloat s, GLfloat t)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord2fv,12);
-	__GLX_PUT_FLOAT(4,s);
-	__GLX_PUT_FLOAT(8,t);
-	__GLX_END(12);
-}
-
-void glTexCoord2fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord2fv,12);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_END(12);
-}
-
-void glTexCoord2i(GLint s, GLint t)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord2iv,12);
-	__GLX_PUT_LONG(4,s);
-	__GLX_PUT_LONG(8,t);
-	__GLX_END(12);
-}
-
-void glTexCoord2iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord2iv,12);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_END(12);
-}
-
-void glTexCoord2s(GLshort s, GLshort t)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord2sv,8);
-	__GLX_PUT_SHORT(4,s);
-	__GLX_PUT_SHORT(6,t);
-	__GLX_END(8);
-}
-
-void glTexCoord2sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord2sv,8);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_END(8);
-}
-
-void glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord3dv,28);
-	__GLX_PUT_DOUBLE(4,s);
-	__GLX_PUT_DOUBLE(12,t);
-	__GLX_PUT_DOUBLE(20,r);
-	__GLX_END(28);
-}
-
-void glTexCoord3dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord3dv,28);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_END(28);
-}
-
-void glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord3fv,16);
-	__GLX_PUT_FLOAT(4,s);
-	__GLX_PUT_FLOAT(8,t);
-	__GLX_PUT_FLOAT(12,r);
-	__GLX_END(16);
-}
-
-void glTexCoord3fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord3fv,16);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_PUT_FLOAT(12,v[2]);
-	__GLX_END(16);
-}
-
-void glTexCoord3i(GLint s, GLint t, GLint r)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord3iv,16);
-	__GLX_PUT_LONG(4,s);
-	__GLX_PUT_LONG(8,t);
-	__GLX_PUT_LONG(12,r);
-	__GLX_END(16);
-}
-
-void glTexCoord3iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord3iv,16);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_END(16);
-}
-
-void glTexCoord3s(GLshort s, GLshort t, GLshort r)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord3sv,12);
-	__GLX_PUT_SHORT(4,s);
-	__GLX_PUT_SHORT(6,t);
-	__GLX_PUT_SHORT(8,r);
-	__GLX_END(12);
-}
-
-void glTexCoord3sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord3sv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_END(12);
-}
-
-void glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord4dv,36);
-	__GLX_PUT_DOUBLE(4,s);
-	__GLX_PUT_DOUBLE(12,t);
-	__GLX_PUT_DOUBLE(20,r);
-	__GLX_PUT_DOUBLE(28,q);
-	__GLX_END(36);
-}
-
-void glTexCoord4dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord4dv,36);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_PUT_DOUBLE(28,v[3]);
-	__GLX_END(36);
-}
-
-void glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord4fv,20);
-	__GLX_PUT_FLOAT(4,s);
-	__GLX_PUT_FLOAT(8,t);
-	__GLX_PUT_FLOAT(12,r);
-	__GLX_PUT_FLOAT(16,q);
-	__GLX_END(20);
-}
-
-void glTexCoord4fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord4fv,20);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_PUT_FLOAT(12,v[2]);
-	__GLX_PUT_FLOAT(16,v[3]);
-	__GLX_END(20);
-}
-
-void glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord4iv,20);
-	__GLX_PUT_LONG(4,s);
-	__GLX_PUT_LONG(8,t);
-	__GLX_PUT_LONG(12,r);
-	__GLX_PUT_LONG(16,q);
-	__GLX_END(20);
-}
-
-void glTexCoord4iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord4iv,20);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_PUT_LONG(16,v[3]);
-	__GLX_END(20);
-}
-
-void glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord4sv,12);
-	__GLX_PUT_SHORT(4,s);
-	__GLX_PUT_SHORT(6,t);
-	__GLX_PUT_SHORT(8,r);
-	__GLX_PUT_SHORT(10,q);
-	__GLX_END(12);
-}
-
-void glTexCoord4sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexCoord4sv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_PUT_SHORT(10,v[3]);
-	__GLX_END(12);
-}
-
-void glVertex2d(GLdouble x, GLdouble y)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex2dv,20);
-	__GLX_PUT_DOUBLE(4,x);
-	__GLX_PUT_DOUBLE(12,y);
-	__GLX_END(20);
-}
-
-void glVertex2dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex2dv,20);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_END(20);
-}
-
-void glVertex2f(GLfloat x, GLfloat y)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex2fv,12);
-	__GLX_PUT_FLOAT(4,x);
-	__GLX_PUT_FLOAT(8,y);
-	__GLX_END(12);
-}
-
-void glVertex2fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex2fv,12);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_END(12);
-}
-
-void glVertex2i(GLint x, GLint y)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex2iv,12);
-	__GLX_PUT_LONG(4,x);
-	__GLX_PUT_LONG(8,y);
-	__GLX_END(12);
-}
-
-void glVertex2iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex2iv,12);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_END(12);
-}
-
-void glVertex2s(GLshort x, GLshort y)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex2sv,8);
-	__GLX_PUT_SHORT(4,x);
-	__GLX_PUT_SHORT(6,y);
-	__GLX_END(8);
-}
-
-void glVertex2sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex2sv,8);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_END(8);
-}
-
-void glVertex3d(GLdouble x, GLdouble y, GLdouble z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex3dv,28);
-	__GLX_PUT_DOUBLE(4,x);
-	__GLX_PUT_DOUBLE(12,y);
-	__GLX_PUT_DOUBLE(20,z);
-	__GLX_END(28);
-}
-
-void glVertex3dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex3dv,28);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_END(28);
-}
-
-void glVertex3f(GLfloat x, GLfloat y, GLfloat z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex3fv,16);
-	__GLX_PUT_FLOAT(4,x);
-	__GLX_PUT_FLOAT(8,y);
-	__GLX_PUT_FLOAT(12,z);
-	__GLX_END(16);
-}
-
-void glVertex3fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex3fv,16);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_PUT_FLOAT(12,v[2]);
-	__GLX_END(16);
-}
-
-void glVertex3i(GLint x, GLint y, GLint z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex3iv,16);
-	__GLX_PUT_LONG(4,x);
-	__GLX_PUT_LONG(8,y);
-	__GLX_PUT_LONG(12,z);
-	__GLX_END(16);
-}
-
-void glVertex3iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex3iv,16);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_END(16);
-}
-
-void glVertex3s(GLshort x, GLshort y, GLshort z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex3sv,12);
-	__GLX_PUT_SHORT(4,x);
-	__GLX_PUT_SHORT(6,y);
-	__GLX_PUT_SHORT(8,z);
-	__GLX_END(12);
-}
-
-void glVertex3sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex3sv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_END(12);
-}
-
-void glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex4dv,36);
-	__GLX_PUT_DOUBLE(4,x);
-	__GLX_PUT_DOUBLE(12,y);
-	__GLX_PUT_DOUBLE(20,z);
-	__GLX_PUT_DOUBLE(28,w);
-	__GLX_END(36);
-}
-
-void glVertex4dv(const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex4dv,36);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_PUT_DOUBLE(28,v[3]);
-	__GLX_END(36);
-}
-
-void glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex4fv,20);
-	__GLX_PUT_FLOAT(4,x);
-	__GLX_PUT_FLOAT(8,y);
-	__GLX_PUT_FLOAT(12,z);
-	__GLX_PUT_FLOAT(16,w);
-	__GLX_END(20);
-}
-
-void glVertex4fv(const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex4fv,20);
-	__GLX_PUT_FLOAT(4,v[0]);
-	__GLX_PUT_FLOAT(8,v[1]);
-	__GLX_PUT_FLOAT(12,v[2]);
-	__GLX_PUT_FLOAT(16,v[3]);
-	__GLX_END(20);
-}
-
-void glVertex4i(GLint x, GLint y, GLint z, GLint w)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex4iv,20);
-	__GLX_PUT_LONG(4,x);
-	__GLX_PUT_LONG(8,y);
-	__GLX_PUT_LONG(12,z);
-	__GLX_PUT_LONG(16,w);
-	__GLX_END(20);
-}
-
-void glVertex4iv(const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex4iv,20);
-	__GLX_PUT_LONG(4,v[0]);
-	__GLX_PUT_LONG(8,v[1]);
-	__GLX_PUT_LONG(12,v[2]);
-	__GLX_PUT_LONG(16,v[3]);
-	__GLX_END(20);
-}
-
-void glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex4sv,12);
-	__GLX_PUT_SHORT(4,x);
-	__GLX_PUT_SHORT(6,y);
-	__GLX_PUT_SHORT(8,z);
-	__GLX_PUT_SHORT(10,w);
-	__GLX_END(12);
-}
-
-void glVertex4sv(const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Vertex4sv,12);
-	__GLX_PUT_SHORT(4,v[0]);
-	__GLX_PUT_SHORT(6,v[1]);
-	__GLX_PUT_SHORT(8,v[2]);
-	__GLX_PUT_SHORT(10,v[3]);
-	__GLX_END(12);
-}
-
-void glClipPlane(GLenum plane, const GLdouble *equation)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ClipPlane,40);
-	__GLX_PUT_DOUBLE(4,equation[0]);
-	__GLX_PUT_DOUBLE(12,equation[1]);
-	__GLX_PUT_DOUBLE(20,equation[2]);
-	__GLX_PUT_DOUBLE(28,equation[3]);
-	__GLX_PUT_LONG(36,plane);
-	__GLX_END(40);
-}
-
-void glColorMaterial(GLenum face, GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ColorMaterial,12);
-	__GLX_PUT_LONG(4,face);
-	__GLX_PUT_LONG(8,mode);
-	__GLX_END(12);
-}
-
-void glCullFace(GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_CullFace,8);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_END(8);
-}
-
-void glFogf(GLenum pname, GLfloat param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Fogf,12);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_FLOAT(8,param);
-	__GLX_END(12);
-}
-
-void glFogfv(GLenum pname, const GLfloat *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glFogfv_size(pname);
-	cmdlen = 8+compsize*4;
-	__GLX_BEGIN(X_GLrop_Fogfv,cmdlen);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_FLOAT_ARRAY(8,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glFogi(GLenum pname, GLint param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Fogi,12);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_LONG(8,param);
-	__GLX_END(12);
-}
-
-void glFogiv(GLenum pname, const GLint *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glFogiv_size(pname);
-	cmdlen = 8+compsize*4;
-	__GLX_BEGIN(X_GLrop_Fogiv,cmdlen);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_LONG_ARRAY(8,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glFrontFace(GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_FrontFace,8);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_END(8);
-}
-
-void glHint(GLenum target, GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Hint,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,mode);
-	__GLX_END(12);
-}
-
-void glLightf(GLenum light, GLenum pname, GLfloat param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Lightf,16);
-	__GLX_PUT_LONG(4,light);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT(12,param);
-	__GLX_END(16);
-}
-
-void glLightfv(GLenum light, GLenum pname, const GLfloat *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glLightfv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_Lightfv,cmdlen);
-	__GLX_PUT_LONG(4,light);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glLighti(GLenum light, GLenum pname, GLint param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Lighti,16);
-	__GLX_PUT_LONG(4,light);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG(12,param);
-	__GLX_END(16);
-}
-
-void glLightiv(GLenum light, GLenum pname, const GLint *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glLightiv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_Lightiv,cmdlen);
-	__GLX_PUT_LONG(4,light);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glLightModelf(GLenum pname, GLfloat param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_LightModelf,12);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_FLOAT(8,param);
-	__GLX_END(12);
-}
-
-void glLightModelfv(GLenum pname, const GLfloat *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glLightModelfv_size(pname);
-	cmdlen = 8+compsize*4;
-	__GLX_BEGIN(X_GLrop_LightModelfv,cmdlen);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_FLOAT_ARRAY(8,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glLightModeli(GLenum pname, GLint param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_LightModeli,12);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_LONG(8,param);
-	__GLX_END(12);
-}
-
-void glLightModeliv(GLenum pname, const GLint *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glLightModeliv_size(pname);
-	cmdlen = 8+compsize*4;
-	__GLX_BEGIN(X_GLrop_LightModeliv,cmdlen);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_LONG_ARRAY(8,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glLineStipple(GLint factor, GLushort pattern)
+void __indirect_glLineStipple(GLint factor, GLushort pattern)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -1995,83 +494,7 @@ void glLineStipple(GLint factor, GLushort pattern)
 	__GLX_END(12);
 }
 
-void glLineWidth(GLfloat width)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_LineWidth,8);
-	__GLX_PUT_FLOAT(4,width);
-	__GLX_END(8);
-}
-
-void glMaterialf(GLenum face, GLenum pname, GLfloat param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Materialf,16);
-	__GLX_PUT_LONG(4,face);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT(12,param);
-	__GLX_END(16);
-}
-
-void glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glMaterialfv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_Materialfv,cmdlen);
-	__GLX_PUT_LONG(4,face);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glMateriali(GLenum face, GLenum pname, GLint param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Materiali,16);
-	__GLX_PUT_LONG(4,face);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG(12,param);
-	__GLX_END(16);
-}
-
-void glMaterialiv(GLenum face, GLenum pname, const GLint *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glMaterialiv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_Materialiv,cmdlen);
-	__GLX_PUT_LONG(4,face);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glPointSize(GLfloat size)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PointSize,8);
-	__GLX_PUT_FLOAT(4,size);
-	__GLX_END(8);
-}
-
-void glPolygonMode(GLenum face, GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PolygonMode,12);
-	__GLX_PUT_LONG(4,face);
-	__GLX_PUT_LONG(8,mode);
-	__GLX_END(12);
-}
-
-void glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
+void __indirect_glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2083,362 +506,7 @@ void glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 	__GLX_END(20);
 }
 
-void glShadeModel(GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ShadeModel,8);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_END(8);
-}
-
-void glTexParameterf(GLenum target, GLenum pname, GLfloat param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexParameterf,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT(12,param);
-	__GLX_END(16);
-}
-
-void glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glTexParameterfv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_TexParameterfv,cmdlen);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glTexParameteri(GLenum target, GLenum pname, GLint param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexParameteri,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG(12,param);
-	__GLX_END(16);
-}
-
-void glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glTexParameteriv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_TexParameteriv,cmdlen);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glTexEnvf(GLenum target, GLenum pname, GLfloat param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexEnvf,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT(12,param);
-	__GLX_END(16);
-}
-
-void glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glTexEnvfv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_TexEnvfv,cmdlen);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glTexEnvi(GLenum target, GLenum pname, GLint param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexEnvi,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG(12,param);
-	__GLX_END(16);
-}
-
-void glTexEnviv(GLenum target, GLenum pname, const GLint *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glTexEnviv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_TexEnviv,cmdlen);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glTexGend(GLenum coord, GLenum pname, GLdouble param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexGend,20);
-	__GLX_PUT_DOUBLE(4,param);
-	__GLX_PUT_LONG(12,coord);
-	__GLX_PUT_LONG(16,pname);
-	__GLX_END(20);
-}
-
-void glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glTexGendv_size(pname);
-	cmdlen = 12+compsize*8;
-	__GLX_BEGIN(X_GLrop_TexGendv,cmdlen);
-	__GLX_PUT_LONG(4,coord);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_DOUBLE_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glTexGenf(GLenum coord, GLenum pname, GLfloat param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexGenf,16);
-	__GLX_PUT_LONG(4,coord);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT(12,param);
-	__GLX_END(16);
-}
-
-void glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glTexGenfv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_TexGenfv,cmdlen);
-	__GLX_PUT_LONG(4,coord);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glTexGeni(GLenum coord, GLenum pname, GLint param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_TexGeni,16);
-	__GLX_PUT_LONG(4,coord);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG(12,param);
-	__GLX_END(16);
-}
-
-void glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glTexGeniv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_TexGeniv,cmdlen);
-	__GLX_PUT_LONG(4,coord);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glInitNames(void)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_InitNames,4);
-	__GLX_END(4);
-}
-
-void glLoadName(GLuint name)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_LoadName,8);
-	__GLX_PUT_LONG(4,name);
-	__GLX_END(8);
-}
-
-void glPassThrough(GLfloat token)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PassThrough,8);
-	__GLX_PUT_FLOAT(4,token);
-	__GLX_END(8);
-}
-
-void glPopName(void)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PopName,4);
-	__GLX_END(4);
-}
-
-void glPushName(GLuint name)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PushName,8);
-	__GLX_PUT_LONG(4,name);
-	__GLX_END(8);
-}
-
-void glDrawBuffer(GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_DrawBuffer,8);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_END(8);
-}
-
-void glClear(GLbitfield mask)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Clear,8);
-	__GLX_PUT_LONG(4,mask);
-	__GLX_END(8);
-}
-
-void glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ClearAccum,20);
-	__GLX_PUT_FLOAT(4,red);
-	__GLX_PUT_FLOAT(8,green);
-	__GLX_PUT_FLOAT(12,blue);
-	__GLX_PUT_FLOAT(16,alpha);
-	__GLX_END(20);
-}
-
-void glClearIndex(GLfloat c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ClearIndex,8);
-	__GLX_PUT_FLOAT(4,c);
-	__GLX_END(8);
-}
-
-void glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ClearColor,20);
-	__GLX_PUT_FLOAT(4,red);
-	__GLX_PUT_FLOAT(8,green);
-	__GLX_PUT_FLOAT(12,blue);
-	__GLX_PUT_FLOAT(16,alpha);
-	__GLX_END(20);
-}
-
-void glClearStencil(GLint s)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ClearStencil,8);
-	__GLX_PUT_LONG(4,s);
-	__GLX_END(8);
-}
-
-void glClearDepth(GLclampd depth)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ClearDepth,12);
-	__GLX_PUT_DOUBLE(4,depth);
-	__GLX_END(12);
-}
-
-void glStencilMask(GLuint mask)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_StencilMask,8);
-	__GLX_PUT_LONG(4,mask);
-	__GLX_END(8);
-}
-
-void glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ColorMask,8);
-	__GLX_PUT_CHAR(4,red);
-	__GLX_PUT_CHAR(5,green);
-	__GLX_PUT_CHAR(6,blue);
-	__GLX_PUT_CHAR(7,alpha);
-	__GLX_END(8);
-}
-
-void glDepthMask(GLboolean flag)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_DepthMask,8);
-	__GLX_PUT_CHAR(4,flag);
-	__GLX_END(8);
-}
-
-void glIndexMask(GLuint mask)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_IndexMask,8);
-	__GLX_PUT_LONG(4,mask);
-	__GLX_END(8);
-}
-
-void glAccum(GLenum op, GLfloat value)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Accum,12);
-	__GLX_PUT_LONG(4,op);
-	__GLX_PUT_FLOAT(8,value);
-	__GLX_END(12);
-}
-
-void glPopAttrib(void)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PopAttrib,4);
-	__GLX_END(4);
-}
-
-void glPushAttrib(GLbitfield mask)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PushAttrib,8);
-	__GLX_PUT_LONG(4,mask);
-	__GLX_END(8);
-}
-
-void glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
+void __indirect_glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2449,7 +517,7 @@ void glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 	__GLX_END(24);
 }
 
-void glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
+void __indirect_glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2460,7 +528,7 @@ void glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 	__GLX_END(16);
 }
 
-void glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
+void __indirect_glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2474,7 +542,7 @@ void glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdo
 	__GLX_END(44);
 }
 
-void glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
+void __indirect_glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2488,157 +556,7 @@ void glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat
 	__GLX_END(28);
 }
 
-void glEvalCoord1d(GLdouble u)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalCoord1dv,12);
-	__GLX_PUT_DOUBLE(4,u);
-	__GLX_END(12);
-}
-
-void glEvalCoord1dv(const GLdouble *u)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalCoord1dv,12);
-	__GLX_PUT_DOUBLE(4,u[0]);
-	__GLX_END(12);
-}
-
-void glEvalCoord1f(GLfloat u)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalCoord1fv,8);
-	__GLX_PUT_FLOAT(4,u);
-	__GLX_END(8);
-}
-
-void glEvalCoord1fv(const GLfloat *u)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalCoord1fv,8);
-	__GLX_PUT_FLOAT(4,u[0]);
-	__GLX_END(8);
-}
-
-void glEvalCoord2d(GLdouble u, GLdouble v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalCoord2dv,20);
-	__GLX_PUT_DOUBLE(4,u);
-	__GLX_PUT_DOUBLE(12,v);
-	__GLX_END(20);
-}
-
-void glEvalCoord2dv(const GLdouble *u)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalCoord2dv,20);
-	__GLX_PUT_DOUBLE(4,u[0]);
-	__GLX_PUT_DOUBLE(12,u[1]);
-	__GLX_END(20);
-}
-
-void glEvalCoord2f(GLfloat u, GLfloat v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalCoord2fv,12);
-	__GLX_PUT_FLOAT(4,u);
-	__GLX_PUT_FLOAT(8,v);
-	__GLX_END(12);
-}
-
-void glEvalCoord2fv(const GLfloat *u)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalCoord2fv,12);
-	__GLX_PUT_FLOAT(4,u[0]);
-	__GLX_PUT_FLOAT(8,u[1]);
-	__GLX_END(12);
-}
-
-void glEvalMesh1(GLenum mode, GLint i1, GLint i2)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalMesh1,16);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_PUT_LONG(8,i1);
-	__GLX_PUT_LONG(12,i2);
-	__GLX_END(16);
-}
-
-void glEvalPoint1(GLint i)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalPoint1,8);
-	__GLX_PUT_LONG(4,i);
-	__GLX_END(8);
-}
-
-void glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalMesh2,24);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_PUT_LONG(8,i1);
-	__GLX_PUT_LONG(12,i2);
-	__GLX_PUT_LONG(16,j1);
-	__GLX_PUT_LONG(20,j2);
-	__GLX_END(24);
-}
-
-void glEvalPoint2(GLint i, GLint j)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_EvalPoint2,12);
-	__GLX_PUT_LONG(4,i);
-	__GLX_PUT_LONG(8,j);
-	__GLX_END(12);
-}
-
-void glAlphaFunc(GLenum func, GLclampf ref)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_AlphaFunc,12);
-	__GLX_PUT_LONG(4,func);
-	__GLX_PUT_FLOAT(8,ref);
-	__GLX_END(12);
-}
-
-void glBlendFunc(GLenum sfactor, GLenum dfactor)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_BlendFunc,12);
-	__GLX_PUT_LONG(4,sfactor);
-	__GLX_PUT_LONG(8,dfactor);
-	__GLX_END(12);
-}
-
-glxproto_4s(BlendFuncSeparate, X_GLrop_BlendFuncSeparate, GLenum)
-
-void glLogicOp(GLenum opcode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_LogicOp,8);
-	__GLX_PUT_LONG(4,opcode);
-	__GLX_END(8);
-}
-
-void glStencilFunc(GLenum func, GLint ref, GLuint mask)
+void __indirect_glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2649,66 +567,7 @@ void glStencilFunc(GLenum func, GLint ref, GLuint mask)
 	__GLX_END(16);
 }
 
-void glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_StencilOp,16);
-	__GLX_PUT_LONG(4,fail);
-	__GLX_PUT_LONG(8,zfail);
-	__GLX_PUT_LONG(12,zpass);
-	__GLX_END(16);
-}
-
-void glDepthFunc(GLenum func)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_DepthFunc,8);
-	__GLX_PUT_LONG(4,func);
-	__GLX_END(8);
-}
-
-void glPixelZoom(GLfloat xfactor, GLfloat yfactor)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PixelZoom,12);
-	__GLX_PUT_FLOAT(4,xfactor);
-	__GLX_PUT_FLOAT(8,yfactor);
-	__GLX_END(12);
-}
-
-void glPixelTransferf(GLenum pname, GLfloat param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PixelTransferf,12);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_FLOAT(8,param);
-	__GLX_END(12);
-}
-
-void glPixelTransferi(GLenum pname, GLint param)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PixelTransferi,12);
-	__GLX_PUT_LONG(4,pname);
-	__GLX_PUT_LONG(8,param);
-	__GLX_END(12);
-}
-
-void glReadBuffer(GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ReadBuffer,8);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_END(8);
-}
-
-void glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
+void __indirect_glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2721,182 +580,7 @@ void glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 	__GLX_END(24);
 }
 
-void glDepthRange(GLclampd zNear, GLclampd zFar)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_DepthRange,20);
-	__GLX_PUT_DOUBLE(4,zNear);
-	__GLX_PUT_DOUBLE(12,zFar);
-	__GLX_END(20);
-}
-
-void glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Frustum,52);
-	__GLX_PUT_DOUBLE(4,left);
-	__GLX_PUT_DOUBLE(12,right);
-	__GLX_PUT_DOUBLE(20,bottom);
-	__GLX_PUT_DOUBLE(28,top);
-	__GLX_PUT_DOUBLE(36,zNear);
-	__GLX_PUT_DOUBLE(44,zFar);
-	__GLX_END(52);
-}
-
-void glLoadIdentity(void)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_LoadIdentity,4);
-	__GLX_END(4);
-}
-
-void glLoadMatrixf(const GLfloat *m)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_LoadMatrixf,68);
-	__GLX_PUT_FLOAT_ARRAY(4,m,16);
-	__GLX_END(68);
-}
-
-void glLoadMatrixd(const GLdouble *m)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_LoadMatrixd,132);
-	__GLX_PUT_DOUBLE_ARRAY(4,m,16);
-	__GLX_END(132);
-}
-
-void glMatrixMode(GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MatrixMode,8);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_END(8);
-}
-
-void glMultMatrixf(const GLfloat *m)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultMatrixf,68);
-	__GLX_PUT_FLOAT_ARRAY(4,m,16);
-	__GLX_END(68);
-}
-
-void glMultMatrixd(const GLdouble *m)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultMatrixd,132);
-	__GLX_PUT_DOUBLE_ARRAY(4,m,16);
-	__GLX_END(132);
-}
-
-void glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Ortho,52);
-	__GLX_PUT_DOUBLE(4,left);
-	__GLX_PUT_DOUBLE(12,right);
-	__GLX_PUT_DOUBLE(20,bottom);
-	__GLX_PUT_DOUBLE(28,top);
-	__GLX_PUT_DOUBLE(36,zNear);
-	__GLX_PUT_DOUBLE(44,zFar);
-	__GLX_END(52);
-}
-
-void glPopMatrix(void)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PopMatrix,4);
-	__GLX_END(4);
-}
-
-void glPushMatrix(void)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PushMatrix,4);
-	__GLX_END(4);
-}
-
-void glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Rotated,36);
-	__GLX_PUT_DOUBLE(4,angle);
-	__GLX_PUT_DOUBLE(12,x);
-	__GLX_PUT_DOUBLE(20,y);
-	__GLX_PUT_DOUBLE(28,z);
-	__GLX_END(36);
-}
-
-void glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Rotatef,20);
-	__GLX_PUT_FLOAT(4,angle);
-	__GLX_PUT_FLOAT(8,x);
-	__GLX_PUT_FLOAT(12,y);
-	__GLX_PUT_FLOAT(16,z);
-	__GLX_END(20);
-}
-
-void glScaled(GLdouble x, GLdouble y, GLdouble z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Scaled,28);
-	__GLX_PUT_DOUBLE(4,x);
-	__GLX_PUT_DOUBLE(12,y);
-	__GLX_PUT_DOUBLE(20,z);
-	__GLX_END(28);
-}
-
-void glScalef(GLfloat x, GLfloat y, GLfloat z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Scalef,16);
-	__GLX_PUT_FLOAT(4,x);
-	__GLX_PUT_FLOAT(8,y);
-	__GLX_PUT_FLOAT(12,z);
-	__GLX_END(16);
-}
-
-void glTranslated(GLdouble x, GLdouble y, GLdouble z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Translated,28);
-	__GLX_PUT_DOUBLE(4,x);
-	__GLX_PUT_DOUBLE(12,y);
-	__GLX_PUT_DOUBLE(20,z);
-	__GLX_END(28);
-}
-
-void glTranslatef(GLfloat x, GLfloat y, GLfloat z)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Translatef,16);
-	__GLX_PUT_FLOAT(4,x);
-	__GLX_PUT_FLOAT(8,y);
-	__GLX_PUT_FLOAT(12,z);
-	__GLX_END(16);
-}
-
-void glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
+void __indirect_glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2908,17 +592,7 @@ void glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 	__GLX_END(20);
 }
 
-void glPolygonOffset(GLfloat factor, GLfloat units)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_PolygonOffset,12);
-	__GLX_PUT_FLOAT(4,factor);
-	__GLX_PUT_FLOAT(8,units);
-	__GLX_END(12);
-}
-
-void glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
+void __indirect_glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2933,7 +607,7 @@ void glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x
 	__GLX_END(32);
 }
 
-void glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
+void __indirect_glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2949,7 +623,7 @@ void glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x
 	__GLX_END(36);
 }
 
-void glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
+void __indirect_glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2963,7 +637,7 @@ void glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLi
 	__GLX_END(28);
 }
 
-void glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+void __indirect_glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -2979,17 +653,7 @@ void glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffse
 	__GLX_END(36);
 }
 
-void glBindTexture(GLenum target, GLuint texture)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_BindTexture,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,texture);
-	__GLX_END(12);
-}
-
-void glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLclampf *priorities)
+void __indirect_glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLclampf *priorities)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -3002,72 +666,7 @@ void glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLclampf *pri
 	__GLX_END(cmdlen);
 }
 
-void glIndexub(GLubyte c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexubv,8);
-	__GLX_PUT_CHAR(4,c);
-	__GLX_END(8);
-}
-
-void glIndexubv(const GLubyte *c)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Indexubv,8);
-	__GLX_PUT_CHAR(4,c[0]);
-	__GLX_END(8);
-}
-
-void glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_BlendColor,20);
-	__GLX_PUT_FLOAT(4,red);
-	__GLX_PUT_FLOAT(8,green);
-	__GLX_PUT_FLOAT(12,blue);
-	__GLX_PUT_FLOAT(16,alpha);
-	__GLX_END(20);
-}
-
-void glBlendEquation(GLenum mode)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_BlendEquation,8);
-	__GLX_PUT_LONG(4,mode);
-	__GLX_END(8);
-}
-
-void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glColorTableParameterfv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_ColorTableParameterfv,cmdlen);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glColorTableParameteriv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_ColorTableParameteriv,cmdlen);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
+void __indirect_glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -3080,7 +679,7 @@ void glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GL
 	__GLX_END(24);
 }
 
-void glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
+void __indirect_glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -3093,55 +692,7 @@ void glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei
 	__GLX_END(24);
 }
 
-void glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ConvolutionParameterf,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT(12,params);
-	__GLX_END(16);
-}
-
-void glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glConvolutionParameterfv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_ConvolutionParameterfv,cmdlen);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_FLOAT_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ConvolutionParameteri,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG(12,params);
-	__GLX_END(16);
-}
-
-void glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	compsize = __glConvolutionParameteriv_size(pname);
-	cmdlen = 12+compsize*4;
-	__GLX_BEGIN(X_GLrop_ConvolutionParameteriv,cmdlen);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,pname);
-	__GLX_PUT_LONG_ARRAY(12,params,compsize);
-	__GLX_END(cmdlen);
-}
-
-void glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
+void __indirect_glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -3154,7 +705,7 @@ void glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GL
 	__GLX_END(24);
 }
 
-void glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
+void __indirect_glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -3168,7 +719,7 @@ void glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GL
 	__GLX_END(28);
 }
 
-void glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
+void __indirect_glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -3180,36 +731,7 @@ void glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean
 	__GLX_END(20);
 }
 
-void glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_Minmax,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,internalformat);
-	__GLX_PUT_CHAR(12,sink);
-	__GLX_END(16);
-}
-
-void glResetHistogram(GLenum target)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ResetHistogram,8);
-	__GLX_PUT_LONG(4,target);
-	__GLX_END(8);
-}
-
-void glResetMinmax(GLenum target)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ResetMinmax,8);
-	__GLX_PUT_LONG(4,target);
-	__GLX_END(8);
-}
-
-void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+void __indirect_glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
 	__GLX_DECLARE_VARIABLES();
 	__GLX_LOAD_VARIABLES();
@@ -3226,546 +748,72 @@ void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffse
 	__GLX_END(40);
 }
 
-void glActiveTextureARB(GLenum texture)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ActiveTextureARB,8);
-	__GLX_PUT_LONG(4,texture);
-	__GLX_END(8);
-}
-
-void glMultiTexCoord1dARB(GLenum target, GLdouble s)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord1dvARB,16);
-	__GLX_PUT_DOUBLE(4,s);
-	__GLX_PUT_LONG(12,target);
-	__GLX_END(16);
-}
-
-void glMultiTexCoord1dvARB(GLenum target, const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord1dvARB,16);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_LONG(12,target);
-	__GLX_END(16);
-}
-
-void glMultiTexCoord1fARB(GLenum target, GLfloat s)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord1fvARB,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_FLOAT(8,s);
-	__GLX_END(12);
-}
-
-void glMultiTexCoord1fvARB(GLenum target, const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord1fvARB,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_FLOAT(8,v[0]);
-	__GLX_END(12);
-}
-
-void glMultiTexCoord1iARB(GLenum target, GLint s)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord1ivARB,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,s);
-	__GLX_END(12);
-}
-
-void glMultiTexCoord1ivARB(GLenum target, const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord1ivARB,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,v[0]);
-	__GLX_END(12);
-}
-
-void glMultiTexCoord1sARB(GLenum target, GLshort s)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord1svARB,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_SHORT(8,s);
-	__GLX_END(12);
-}
-
-void glMultiTexCoord1svARB(GLenum target, const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord1svARB,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_SHORT(8,v[0]);
-	__GLX_END(12);
-}
-
-void glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord2dvARB,24);
-	__GLX_PUT_DOUBLE(4,s);
-	__GLX_PUT_DOUBLE(12,t);
-	__GLX_PUT_LONG(20,target);
-	__GLX_END(24);
-}
-
-void glMultiTexCoord2dvARB(GLenum target, const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord2dvARB,24);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_LONG(20,target);
-	__GLX_END(24);
-}
-
-void glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord2fvARB,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_FLOAT(8,s);
-	__GLX_PUT_FLOAT(12,t);
-	__GLX_END(16);
-}
-
-void glMultiTexCoord2fvARB(GLenum target, const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord2fvARB,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_FLOAT(8,v[0]);
-	__GLX_PUT_FLOAT(12,v[1]);
-	__GLX_END(16);
-}
-
-void glMultiTexCoord2iARB(GLenum target, GLint s, GLint t)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord2ivARB,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,s);
-	__GLX_PUT_LONG(12,t);
-	__GLX_END(16);
-}
-
-void glMultiTexCoord2ivARB(GLenum target, const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord2ivARB,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,v[0]);
-	__GLX_PUT_LONG(12,v[1]);
-	__GLX_END(16);
-}
-
-void glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord2svARB,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_SHORT(8,s);
-	__GLX_PUT_SHORT(10,t);
-	__GLX_END(12);
-}
-
-void glMultiTexCoord2svARB(GLenum target, const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord2svARB,12);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_SHORT(8,v[0]);
-	__GLX_PUT_SHORT(10,v[1]);
-	__GLX_END(12);
-}
-
-void glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord3dvARB,32);
-	__GLX_PUT_DOUBLE(4,s);
-	__GLX_PUT_DOUBLE(12,t);
-	__GLX_PUT_DOUBLE(20,r);
-	__GLX_PUT_LONG(28,target);
-	__GLX_END(32);
-}
-
-void glMultiTexCoord3dvARB(GLenum target, const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord3dvARB,32);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_PUT_LONG(28,target);
-	__GLX_END(32);
-}
-
-void glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord3fvARB,20);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_FLOAT(8,s);
-	__GLX_PUT_FLOAT(12,t);
-	__GLX_PUT_FLOAT(16,r);
-	__GLX_END(20);
-}
-
-void glMultiTexCoord3fvARB(GLenum target, const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord3fvARB,20);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_FLOAT(8,v[0]);
-	__GLX_PUT_FLOAT(12,v[1]);
-	__GLX_PUT_FLOAT(16,v[2]);
-	__GLX_END(20);
-}
-
-void glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord3ivARB,20);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,s);
-	__GLX_PUT_LONG(12,t);
-	__GLX_PUT_LONG(16,r);
-	__GLX_END(20);
-}
-
-void glMultiTexCoord3ivARB(GLenum target, const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord3ivARB,20);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,v[0]);
-	__GLX_PUT_LONG(12,v[1]);
-	__GLX_PUT_LONG(16,v[2]);
-	__GLX_END(20);
-}
-
-void glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord3svARB,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_SHORT(8,s);
-	__GLX_PUT_SHORT(10,t);
-	__GLX_PUT_SHORT(12,r);
-	__GLX_END(16);
-}
-
-void glMultiTexCoord3svARB(GLenum target, const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord3svARB,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_SHORT(8,v[0]);
-	__GLX_PUT_SHORT(10,v[1]);
-	__GLX_PUT_SHORT(12,v[2]);
-	__GLX_END(16);
-}
-
-void glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord4dvARB,40);
-	__GLX_PUT_DOUBLE(4,s);
-	__GLX_PUT_DOUBLE(12,t);
-	__GLX_PUT_DOUBLE(20,r);
-	__GLX_PUT_DOUBLE(28,q);
-	__GLX_PUT_LONG(36,target);
-	__GLX_END(40);
-}
-
-void glMultiTexCoord4dvARB(GLenum target, const GLdouble *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord4dvARB,40);
-	__GLX_PUT_DOUBLE(4,v[0]);
-	__GLX_PUT_DOUBLE(12,v[1]);
-	__GLX_PUT_DOUBLE(20,v[2]);
-	__GLX_PUT_DOUBLE(28,v[3]);
-	__GLX_PUT_LONG(36,target);
-	__GLX_END(40);
-}
-
-void glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord4fvARB,24);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_FLOAT(8,s);
-	__GLX_PUT_FLOAT(12,t);
-	__GLX_PUT_FLOAT(16,r);
-	__GLX_PUT_FLOAT(20,q);
-	__GLX_END(24);
-}
-
-void glMultiTexCoord4fvARB(GLenum target, const GLfloat *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord4fvARB,24);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_FLOAT(8,v[0]);
-	__GLX_PUT_FLOAT(12,v[1]);
-	__GLX_PUT_FLOAT(16,v[2]);
-	__GLX_PUT_FLOAT(20,v[3]);
-	__GLX_END(24);
-}
-
-void glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord4ivARB,24);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,s);
-	__GLX_PUT_LONG(12,t);
-	__GLX_PUT_LONG(16,r);
-	__GLX_PUT_LONG(20,q);
-	__GLX_END(24);
-}
-
-void glMultiTexCoord4ivARB(GLenum target, const GLint *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord4ivARB,24);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_LONG(8,v[0]);
-	__GLX_PUT_LONG(12,v[1]);
-	__GLX_PUT_LONG(16,v[2]);
-	__GLX_PUT_LONG(20,v[3]);
-	__GLX_END(24);
-}
-
-void glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord4svARB,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_SHORT(8,s);
-	__GLX_PUT_SHORT(10,t);
-	__GLX_PUT_SHORT(12,r);
-	__GLX_PUT_SHORT(14,q);
-	__GLX_END(16);
-}
-
-void glMultiTexCoord4svARB(GLenum target, const GLshort *v)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_MultiTexCoord4svARB,16);
-	__GLX_PUT_LONG(4,target);
-	__GLX_PUT_SHORT(8,v[0]);
-	__GLX_PUT_SHORT(10,v[1]);
-	__GLX_PUT_SHORT(12,v[2]);
-	__GLX_PUT_SHORT(14,v[3]);
-	__GLX_END(16);
-}
-
-void glLoadTransposeMatrixfARB(const GLfloat *m)
-{
-	__GLX_DECLARE_VARIABLES();
-        GLfloat t[16];
-        int i, j;
-	__GLX_LOAD_VARIABLES();
-        for (i = 0; i < 4; i++) {
-            for (j = 0; j < 4; j++) {
-                t[i*4+j] = m[j*4+i];
-             }
-         }
-	__GLX_BEGIN(X_GLrop_LoadMatrixf,68);
-	__GLX_PUT_FLOAT_ARRAY(4,t,16);
-	__GLX_END(68);
-}
-
-void glMultTransposeMatrixfARB(const GLfloat *m)
-{
-	__GLX_DECLARE_VARIABLES();
-        GLfloat t[16];
-        int i, j;
-	__GLX_LOAD_VARIABLES();
-        for (i = 0; i < 4; i++) {
-            for (j = 0; j < 4; j++) {
-                t[i*4+j] = m[j*4+i];
-             }
-         }
-	__GLX_BEGIN(X_GLrop_MultMatrixf,68);
-	__GLX_PUT_FLOAT_ARRAY(4,t,16);
-	__GLX_END(68);
-}
-
-void glLoadTransposeMatrixdARB(const GLdouble *m)
+void __indirect_glWindowPos2dARB(GLdouble x, GLdouble y)
 {
-	__GLX_DECLARE_VARIABLES();
-        GLdouble t[16];
-        int i, j;
-	__GLX_LOAD_VARIABLES();
-        for (i = 0; i < 4; i++) {
-            for (j = 0; j < 4; j++) {
-                t[i*4+j] = m[j*4+i];
-             }
-         }
-	__GLX_BEGIN(X_GLrop_LoadMatrixd,132);
-	__GLX_PUT_DOUBLE_ARRAY(4,t,16);
-	__GLX_END(132);
+	__indirect_glWindowPos3fARB(x, y, 0.0);
 }
 
-void glMultTransposeMatrixdARB(const GLdouble *m)
+void __indirect_glWindowPos2iARB(GLint x, GLint y)
 {
-	__GLX_DECLARE_VARIABLES();
-        GLdouble t[16];
-        int i, j;
-	__GLX_LOAD_VARIABLES();
-        for (i = 0; i < 4; i++) {
-            for (j = 0; j < 4; j++) {
-                t[i*4+j] = m[j*4+i];
-             }
-         }
-	__GLX_BEGIN(X_GLrop_MultMatrixd,132);
-	__GLX_PUT_DOUBLE_ARRAY(4,t,16);
-	__GLX_END(132);
+	__indirect_glWindowPos3fARB(x, y, 0.0);
 }
 
-
-/*
- * New extension functions
- */
-
-glxvendr_enum1_V(PointParameterf, X_GLrop_PointParameterf, GLfloat, ARB)
-glxproto_enum1_V(PointParameteri, X_GLrop_PointParameteri, GLint)
-
-void glWindowPos2dARB(GLdouble x, GLdouble y)
-{
-	glWindowPos3fARB(x, y, 0.0);
-}
-
-void glWindowPos2iARB(GLint x, GLint y)
+void __indirect_glWindowPos2fARB(GLfloat x, GLfloat y)
 {
-	glWindowPos3fARB(x, y, 0.0);
+	__indirect_glWindowPos3fARB(x, y, 0.0);
 }
 
-void glWindowPos2fARB(GLfloat x, GLfloat y)
+void __indirect_glWindowPos2sARB(GLshort x, GLshort y)
 {
-	glWindowPos3fARB(x, y, 0.0);
+	__indirect_glWindowPos3fARB(x, y, 0.0);
 }
 
-void glWindowPos2sARB(GLshort x, GLshort y)
+void __indirect_glWindowPos2dvARB(const GLdouble * p)
 {
-	glWindowPos3fARB(x, y, 0.0);
+	__indirect_glWindowPos3fARB(p[0], p[1], 0.0);
 }
 
-void glWindowPos2dvARB(const GLdouble * p)
+void __indirect_glWindowPos2fvARB(const GLfloat * p)
 {
-	glWindowPos3fARB(p[0], p[1], 0.0);
+	__indirect_glWindowPos3fARB(p[0], p[1], 0.0);
 }
 
-void glWindowPos2fvARB(const GLfloat * p)
+void __indirect_glWindowPos2ivARB(const GLint * p)
 {
-	glWindowPos3fARB(p[0], p[1], 0.0);
+	__indirect_glWindowPos3fARB(p[0], p[1], 0.0);
 }
 
-void glWindowPos2ivARB(const GLint * p)
+void __indirect_glWindowPos2svARB(const GLshort * p)
 {
-	glWindowPos3fARB(p[0], p[1], 0.0);
+	__indirect_glWindowPos3fARB(p[0], p[1], 0.0);
 }
 
-void glWindowPos2svARB(const GLshort * p)
+void __indirect_glWindowPos3dARB(GLdouble x, GLdouble y, GLdouble z)
 {
-	glWindowPos3fARB(p[0], p[1], 0.0);
+	__indirect_glWindowPos3fARB(x, y, z);
 }
 
-void glWindowPos3dARB(GLdouble x, GLdouble y, GLdouble z)
+void __indirect_glWindowPos3iARB(GLint x, GLint y, GLint z)
 {
-	glWindowPos3fARB(x, y, z);
+	__indirect_glWindowPos3fARB(x, y, z);
 }
 
-void glWindowPos3fARB(GLfloat x, GLfloat y, GLfloat z)
+void __indirect_glWindowPos3sARB(GLshort x, GLshort y, GLshort z)
 {
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_WindowPos3fARB,16);
-	__GLX_PUT_FLOAT(4,x);
-	__GLX_PUT_FLOAT(8,y);
-	__GLX_PUT_FLOAT(12,z);
-	__GLX_END(16);
+	__indirect_glWindowPos3fARB(x, y, z);
 }
 
-void glWindowPos3iARB(GLint x, GLint y, GLint z)
+void __indirect_glWindowPos3dvARB(const GLdouble * p)
 {
-	glWindowPos3fARB(x, y, z);
+	__indirect_glWindowPos3fARB(p[0], p[1], p[2]);
 }
 
-void glWindowPos3sARB(GLshort x, GLshort y, GLshort z)
+void __indirect_glWindowPos3ivARB(const GLint * p)
 {
-	glWindowPos3fARB(x, y, z);
+	__indirect_glWindowPos3fARB(p[0], p[1], p[2]);
 }
 
-void glWindowPos3dvARB(const GLdouble * p)
+void __indirect_glWindowPos3svARB(const GLshort * p)
 {
-	glWindowPos3fARB(p[0], p[1], p[2]);
-}
-
-void glWindowPos3fvARB(const GLfloat * p)
-{
-	glWindowPos3fARB(p[0], p[1], p[2]);
-}
-
-void glWindowPos3ivARB(const GLint * p)
-{
-	glWindowPos3fARB(p[0], p[1], p[2]);
-}
-
-void glWindowPos3svARB(const GLshort * p)
-{
-	glWindowPos3fARB(p[0], p[1], p[2]);
-}
-
-void glActiveStencilFaceEXT(GLenum face)
-{
-	__GLX_DECLARE_VARIABLES();
-	__GLX_LOAD_VARIABLES();
-	__GLX_BEGIN(X_GLrop_ActiveStencilFaceEXT,8);
-	__GLX_PUT_LONG(4,face);
-	__GLX_END(8);
+	__indirect_glWindowPos3fARB(p[0], p[1], p[2]);
 }
diff --git a/xc/lib/GL/glx/glxcmds.c b/xc/lib/GL/glx/glxcmds.c
index 35c59e893..23e3bf707 100644
--- a/xc/lib/GL/glx/glxcmds.c
+++ b/xc/lib/GL/glx/glxcmds.c
@@ -86,11 +86,13 @@ const char __glXGLClientExtensions[] =
 			"GL_EXT_fog_coord "
 			"GL_EXT_multi_draw_arrays "
 			"GL_EXT_packed_pixels "
+			"GL_EXT_paletted_texture "
 			"GL_EXT_polygon_offset "
 			"GL_EXT_rescale_normal "
 			"GL_EXT_secondary_color "
 			"GL_EXT_separate_specular_color "
 			"GL_EXT_shadow_funcs "
+			"GL_EXT_shared_texture_palette "
  			"GL_EXT_stencil_two_side "
 			"GL_EXT_stencil_wrap "
 			"GL_EXT_subtexture "
@@ -103,6 +105,7 @@ const char __glXGLClientExtensions[] =
 			"GL_EXT_texture_filter_anisotropic "
  			"GL_EXT_texture_lod "
  			"GL_EXT_texture_lod_bias "
+ 			"GL_EXT_texture_mirror_clamp "
 			"GL_EXT_texture_object "
 			"GL_EXT_texture_rectangle "
 			"GL_EXT_vertex_array "
@@ -125,6 +128,7 @@ const char __glXGLClientExtensions[] =
 			"GL_IBM_rasterpos_clip "
 			"GL_IBM_texture_clamp_nodraw "
 			"GL_IBM_texture_mirrored_repeat "
+			"GL_INGR_blend_func_separate "
 			"GL_INGR_interlace_read "
  			"GL_MESA_pack_invert "
  			"GL_MESA_ycbcr_texture "
@@ -136,6 +140,7 @@ const char __glXGLClientExtensions[] =
 			"GL_NV_multisample_filter_hint "
 			"GL_NV_point_sprite "
 			"GL_NV_texgen_reflection "
+			"GL_NV_texture_env_combine4 "
 			"GL_NV_texture_rectangle "
 			"GL_SGIS_generate_mipmap "
 			"GL_SGIS_multisample "
diff --git a/xc/lib/GL/glx/indirect.h b/xc/lib/GL/glx/indirect.h
index 98d12e57b..d5f72303f 100644
--- a/xc/lib/GL/glx/indirect.h
+++ b/xc/lib/GL/glx/indirect.h
@@ -32,78 +32,401 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
-#ifndef _INDIRECT_H_
-#define _INDIRECT_H_
+#if !defined( _INDIRECT_H_ ) || defined( GENERATE_GLX_PROTOCOL_FUNCTIONS )
 
-#include "indirect_wrap.h"
+# if !defined( _INDIRECT_H_ ) 
+#  if defined( GENERATE_GLX_PROTOCOL_FUNCTIONS )
+#   error "indirect.h must be included once without GENERATE_GLX_PROTOCOL_FUNCTIONS defined!"
+#  endif
 
-/* NOTE: This file could be automatically generated */
+#  define _INDIRECT_H_
+#  include "indirect_wrap.h"
 
-void __indirect_glAccum(GLenum op, GLfloat value);
-void __indirect_glAlphaFunc(GLenum func, GLclampf ref);
+#  define glxproto_void(name, rop) \
+   extern void __indirect_gl ## name ( void );
+#  define glxproto_Cv(name, rop, type, count) \
+   extern void __indirect_gl ## name (const type * v);
+#  define glxproto_Cv_transpose(name, rop, type, w) \
+   extern void __indirect_gl ## name (const type * v);
+#  define glxproto_1s(name, rop, type) \
+   extern void __indirect_gl ## name (type v1);
+#  define glxproto_2s(name, rop, type) \
+   extern void __indirect_gl ## name (type v1, type v2);
+#  define glxproto_3s(name, rop, type) \
+   extern void __indirect_gl ## name (type v1, type v2, type v3);
+#  define glxproto_4s(name, rop, type) \
+   extern void __indirect_gl ## name (type v1, type v2, type v3, type v4);
+#  define glxproto_6s(name, rop, type) \
+   void __indirect_gl ## name (type v1, type v2, type v3, type v4, type v5, type v6);
+#  define glxproto_enum1_1s(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, type v1);
+#  define glxproto_enum1_1v(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, const type * v);
+#  define glxproto_enum1_2s(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, type v1, type v2);
+#  define glxproto_enum1_2v(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, const type * v);
+#  define glxproto_enum1_3s(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, type v1, type v2, type v3);
+#  define glxproto_enum1_3v(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, const type * v);
+#  define glxproto_enum1_4s(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, type v1, type v2, type v3, type v4);
+#  define glxproto_enum1_4v(name, rop, type) \
+   void __indirect_gl ## name (GLenum e, const type * v);
+#  define glxproto_enum1_Vv(name, rop, type) \
+   void __indirect_gl ## name (GLenum pname, const type * v);
+#  define glxproto_enum2_1s(name, rop, type) \
+   void __indirect_gl ## name (GLenum target, GLenum pname, type v1);
+#define glxproto_enum2_Vv(name, rop, type) \
+   void __indirect_gl ## name (GLenum target, GLenum pname, const type * v);
+
+# endif /* !defined( _INDIRECT_H_ ) */
+
+#define glxproto_1(name, rop, type) \
+   glxproto_1s(name,      rop, type) \
+   glxproto_Cv(name ## v, rop, type, 1)
+
+#define glxvendr_1(name, rop, type, VEN) \
+   glxproto_1s(name ## VEN,      rop, type) \
+   glxproto_Cv(name ## v ## VEN, rop, type, 1)
+
+#define glxproto_2(name, rop, type) \
+   glxproto_2s(name,      rop, type) \
+   glxproto_Cv(name ## v, rop, type, 2)
+
+#define glxvendr_2(name, rop, type, VEN) \
+   glxproto_2s(name ## VEN,      rop, type) \
+   glxproto_Cv(name ## v ## VEN, rop, type, 2)
+
+#define glxproto_3(name, rop, type) \
+   glxproto_3s(name,      rop, type) \
+   glxproto_Cv(name ## v, rop, type, 3)
+
+#define glxvendr_3(name, rop, type, VEN) \
+   glxproto_3s(name ## VEN,      rop, type) \
+   glxproto_Cv(name ## v ## VEN, rop, type, 3)
+
+#define glxproto_4(name, rop, type) \
+   glxproto_4s(name,      rop, type) \
+   glxproto_Cv(name ## v, rop, type, 4)
+
+#define glxproto_enum1_1(name, rop, type) \
+   glxproto_enum1_1s(name,      rop, type) \
+   glxproto_enum1_1v(name ## v, rop, type)
+
+#define glxvendr_enum1_1(name, rop, type, VEN) \
+   glxproto_enum1_1s(name ## VEN,      rop, type) \
+   glxproto_enum1_1v(name ## v ## VEN, rop, type)
+
+#define glxproto_enum1_2(name, rop, type) \
+   glxproto_enum1_2s(name,      rop, type) \
+   glxproto_enum1_2v(name ## v, rop, type)
+
+#define glxvendr_enum1_2(name, rop, type, VEN) \
+   glxproto_enum1_2s(name ## VEN,      rop, type) \
+   glxproto_enum1_2v(name ## v ## VEN, rop, type)
+
+#define glxproto_enum1_3(name, rop, type) \
+   glxproto_enum1_3s(name,      rop, type) \
+   glxproto_enum1_3v(name ## v, rop, type)
+
+#define glxvendr_enum1_3(name, rop, type, VEN) \
+   glxproto_enum1_3s(name ## VEN,      rop, type) \
+   glxproto_enum1_3v(name ## v ## VEN, rop, type)
+
+#define glxproto_enum1_4(name, rop, type) \
+   glxproto_enum1_4s(name,      rop, type) \
+   glxproto_enum1_4v(name ## v, rop, type)
+
+#define glxvendr_enum1_4(name, rop, type, VEN) \
+   glxproto_enum1_4s(name ## VEN,      rop, type) \
+   glxproto_enum1_4v(name ## v ## VEN, rop, type)
+
+#define glxproto_enum1_V(name, rop, type) \
+   glxproto_enum1_1s(name,      rop,      type) \
+   glxproto_enum1_Vv(name ## v, rop ## v, type)
+
+#define glxvendr_enum1_V(name, rop, type, VEN) \
+   glxproto_enum1_1s(name ## VEN,      rop ## VEN,      type) \
+   glxproto_enum1_Vv(name ## v ## VEN, rop ## v ## VEN, type)
+
+#define glxproto_enum2_V(name, rop, type) \
+   glxproto_enum2_1s(name,      rop,      type) \
+   glxproto_enum2_Vv(name ## v, rop ## v, type)
+
+#define glxvendr_enum2_V(name, rop, type, VEN) \
+   glxproto_enum2_1s(name ## VEN,      rop ## VEN,      type) \
+   glxproto_enum2_Vv(name ## v ## VEN, rop ## v ## VEN, type)
+
+glxproto_1s(CallList, X_GLrop_CallList, GLuint)
+glxproto_1s(ListBase, X_GLrop_ListBase, GLuint)
+glxproto_1s(Begin,    X_GLrop_Begin,    GLenum)
+
+glxproto_3(Color3b,  X_GLrop_Color3bv,  GLbyte)
+glxproto_3(Color3s,  X_GLrop_Color3sv,  GLshort)
+glxproto_3(Color3i,  X_GLrop_Color3iv,  GLint)
+glxproto_3(Color3ub, X_GLrop_Color3ubv, GLubyte)
+glxproto_3(Color3us, X_GLrop_Color3usv, GLushort)
+glxproto_3(Color3ui, X_GLrop_Color3uiv, GLuint)
+glxproto_3(Color3f,  X_GLrop_Color3fv,  GLfloat)
+glxproto_3(Color3d,  X_GLrop_Color3dv,  GLdouble)
+
+glxproto_4(Color4b,  X_GLrop_Color4bv,  GLbyte)
+glxproto_4(Color4s,  X_GLrop_Color4sv,  GLshort)
+glxproto_4(Color4i,  X_GLrop_Color4iv,  GLint)
+glxproto_4(Color4ub, X_GLrop_Color4ubv, GLubyte)
+glxproto_4(Color4us, X_GLrop_Color4usv, GLushort)
+glxproto_4(Color4ui, X_GLrop_Color4uiv, GLuint)
+glxproto_4(Color4f,  X_GLrop_Color4fv,  GLfloat)
+glxproto_4(Color4d,  X_GLrop_Color4dv,  GLdouble)
+
+glxproto_1(FogCoordf, X_GLrop_FogCoordfv, GLfloat)
+glxproto_1(FogCoordd, X_GLrop_FogCoorddv, GLdouble)
+
+glxproto_3(SecondaryColor3b,  X_GLrop_SecondaryColor3bv,  GLbyte)
+glxproto_3(SecondaryColor3s,  X_GLrop_SecondaryColor3sv,  GLshort)
+glxproto_3(SecondaryColor3i,  X_GLrop_SecondaryColor3iv,  GLint)
+glxproto_3(SecondaryColor3ub, X_GLrop_SecondaryColor3ubv, GLubyte)
+glxproto_3(SecondaryColor3us, X_GLrop_SecondaryColor3usv, GLushort)
+glxproto_3(SecondaryColor3ui, X_GLrop_SecondaryColor3uiv, GLuint)
+glxproto_3(SecondaryColor3f,  X_GLrop_SecondaryColor3fv,  GLfloat)
+glxproto_3(SecondaryColor3d,  X_GLrop_SecondaryColor3dv,  GLdouble)
+
+glxproto_1(EdgeFlag, X_GLrop_EdgeFlagv, GLboolean)
+
+glxproto_1(Indexd,  X_GLrop_Indexdv,  GLdouble)
+glxproto_1(Indexf,  X_GLrop_Indexfv,  GLfloat)
+glxproto_1(Indexi,  X_GLrop_Indexiv,  GLint)
+glxproto_1(Indexs,  X_GLrop_Indexsv,  GLshort)
+glxproto_1(Indexub, X_GLrop_Indexubv, GLubyte)
+
+glxproto_void(End, X_GLrop_End)
+
+glxproto_3(Normal3b, X_GLrop_Normal3bv, GLbyte)
+glxproto_3(Normal3s, X_GLrop_Normal3sv, GLshort)
+glxproto_3(Normal3i, X_GLrop_Normal3iv, GLint)
+glxproto_3(Normal3f, X_GLrop_Normal3fv, GLfloat)
+glxproto_3(Normal3d, X_GLrop_Normal3dv, GLdouble)
+
+glxproto_2(RasterPos2s, X_GLrop_RasterPos2sv, GLshort)
+glxproto_2(RasterPos2i, X_GLrop_RasterPos2iv, GLint)
+glxproto_2(RasterPos2f, X_GLrop_RasterPos2fv, GLfloat)
+glxproto_2(RasterPos2d, X_GLrop_RasterPos2dv, GLdouble)
+glxproto_3(RasterPos3s, X_GLrop_RasterPos3sv, GLshort)
+glxproto_3(RasterPos3i, X_GLrop_RasterPos3iv, GLint)
+glxproto_3(RasterPos3f, X_GLrop_RasterPos3fv, GLfloat)
+glxproto_3(RasterPos3d, X_GLrop_RasterPos3dv, GLdouble)
+glxproto_4(RasterPos4s, X_GLrop_RasterPos4sv, GLshort)
+glxproto_4(RasterPos4i, X_GLrop_RasterPos4iv, GLint)
+glxproto_4(RasterPos4f, X_GLrop_RasterPos4fv, GLfloat)
+glxproto_4(RasterPos4d, X_GLrop_RasterPos4dv, GLdouble)
+
+glxproto_1(TexCoord1s, X_GLrop_TexCoord1sv, GLshort)
+glxproto_1(TexCoord1i, X_GLrop_TexCoord1iv, GLint)
+glxproto_1(TexCoord1f, X_GLrop_TexCoord1fv, GLfloat)
+glxproto_1(TexCoord1d, X_GLrop_TexCoord1dv, GLdouble)
+glxproto_2(TexCoord2s, X_GLrop_TexCoord2sv, GLshort)
+glxproto_2(TexCoord2i, X_GLrop_TexCoord2iv, GLint)
+glxproto_2(TexCoord2f, X_GLrop_TexCoord2fv, GLfloat)
+glxproto_2(TexCoord2d, X_GLrop_TexCoord2dv, GLdouble)
+glxproto_3(TexCoord3s, X_GLrop_TexCoord3sv, GLshort)
+glxproto_3(TexCoord3i, X_GLrop_TexCoord3iv, GLint)
+glxproto_3(TexCoord3f, X_GLrop_TexCoord3fv, GLfloat)
+glxproto_3(TexCoord3d, X_GLrop_TexCoord3dv, GLdouble)
+glxproto_4(TexCoord4s, X_GLrop_TexCoord4sv, GLshort)
+glxproto_4(TexCoord4i, X_GLrop_TexCoord4iv, GLint)
+glxproto_4(TexCoord4f, X_GLrop_TexCoord4fv, GLfloat)
+glxproto_4(TexCoord4d, X_GLrop_TexCoord4dv, GLdouble)
+
+glxproto_2(Vertex2s, X_GLrop_Vertex2sv, GLshort)
+glxproto_2(Vertex2i, X_GLrop_Vertex2iv, GLint)
+glxproto_2(Vertex2f, X_GLrop_Vertex2fv, GLfloat)
+glxproto_2(Vertex2d, X_GLrop_Vertex2dv, GLdouble)
+glxproto_3(Vertex3s, X_GLrop_Vertex3sv, GLshort)
+glxproto_3(Vertex3i, X_GLrop_Vertex3iv, GLint)
+glxproto_3(Vertex3f, X_GLrop_Vertex3fv, GLfloat)
+glxproto_3(Vertex3d, X_GLrop_Vertex3dv, GLdouble)
+glxproto_4(Vertex4s, X_GLrop_Vertex4sv, GLshort)
+glxproto_4(Vertex4i, X_GLrop_Vertex4iv, GLint)
+glxproto_4(Vertex4f, X_GLrop_Vertex4fv, GLfloat)
+glxproto_4(Vertex4d, X_GLrop_Vertex4dv, GLdouble)
+
+glxproto_enum1_4v(ClipPlane, X_GLrop_ClipPlane, GLdouble)
+
+glxproto_2s(ColorMaterial, X_GLrop_ColorMaterial, GLenum)
+
+glxproto_1s(CullFace, X_GLrop_CullFace, GLenum)
+
+glxproto_enum1_V(Fogi, X_GLrop_Fogi, GLint)
+glxproto_enum1_V(Fogf, X_GLrop_Fogf, GLfloat)
+
+glxproto_1s(FrontFace, X_GLrop_FrontFace, GLenum)
+glxproto_2s(Hint,      X_GLrop_Hint,      GLenum)
+
+glxproto_enum2_V(Lighti,      X_GLrop_Lighti,      GLint)
+glxproto_enum2_V(Lightf,      X_GLrop_Lightf,      GLfloat)
+
+glxproto_enum1_V(LightModeli, X_GLrop_LightModeli, GLint)
+glxproto_enum1_V(LightModelf, X_GLrop_LightModelf, GLfloat)
+
+glxproto_1s(LineWidth, X_GLrop_LineWidth, GLfloat)
+
+glxproto_enum2_V(Materiali, X_GLrop_Materiali, GLint)
+glxproto_enum2_V(Materialf, X_GLrop_Materialf, GLfloat)
+
+glxproto_1s(PointSize, X_GLrop_PointSize, GLfloat)
+
+glxproto_2s(PolygonMode, X_GLrop_PolygonMode, GLenum)
+
+glxproto_1s(ShadeModel, X_GLrop_ShadeModel, GLenum)
+
+glxproto_enum2_V(TexParameteri, X_GLrop_TexParameteri, GLint)
+glxproto_enum2_V(TexParameterf, X_GLrop_TexParameterf, GLfloat)
+
+glxproto_enum2_V(TexEnvi, X_GLrop_TexEnvi, GLint)
+glxproto_enum2_V(TexEnvf, X_GLrop_TexEnvf, GLfloat)
+glxproto_enum2_V(TexGeni, X_GLrop_TexGeni, GLint)
+glxproto_enum2_V(TexGenf, X_GLrop_TexGenf, GLfloat)
+glxproto_enum2_V(TexGend, X_GLrop_TexGend, GLdouble)
+
+glxproto_void(InitNames, X_GLrop_InitNames)
+glxproto_1s(LoadName, X_GLrop_LoadName, GLuint)
+glxproto_1s(PassThrough, X_GLrop_PassThrough, GLfloat)
+glxproto_void(PopName, X_GLrop_PopName)
+glxproto_1s(PushName, X_GLrop_PushName, GLuint)
+
+glxproto_1s(DrawBuffer, X_GLrop_DrawBuffer, GLenum)
+glxproto_1s(Clear, X_GLrop_Clear, GLbitfield)
+
+glxproto_4s(ClearAccum,   X_GLrop_ClearAccum,   GLfloat)
+glxproto_1s(ClearIndex,   X_GLrop_ClearIndex,   GLfloat)
+glxproto_4s(ClearColor,   X_GLrop_ClearColor,   GLclampf)
+glxproto_1s(ClearStencil, X_GLrop_ClearStencil, GLint)
+glxproto_1s(ClearDepth,   X_GLrop_ClearDepth,   GLclampd)
+
+glxproto_1s(StencilMask,  X_GLrop_StencilMask,  GLuint)
+glxproto_4s(ColorMask,    X_GLrop_ColorMask,    GLboolean)
+glxproto_1s(DepthMask,    X_GLrop_DepthMask,    GLboolean)
+glxproto_1s(IndexMask,    X_GLrop_IndexMask,    GLuint)
+
+glxproto_enum1_1s(Accum, X_GLrop_Accum, GLfloat)
+
+glxproto_void(PopAttrib, X_GLrop_PopAttrib)
+glxproto_1s(PushAttrib,  X_GLrop_PushAttrib, GLbitfield)
+
+glxproto_1(EvalCoord1f, X_GLrop_EvalCoord1fv, GLfloat)
+glxproto_1(EvalCoord1d, X_GLrop_EvalCoord1dv, GLdouble)
+glxproto_2(EvalCoord2f, X_GLrop_EvalCoord2fv, GLfloat)
+glxproto_2(EvalCoord2d, X_GLrop_EvalCoord2dv, GLdouble)
+glxproto_enum1_2s(EvalMesh1, X_GLrop_EvalMesh1, GLint)
+glxproto_enum1_4s(EvalMesh2, X_GLrop_EvalMesh2, GLint)
+glxproto_1s(EvalPoint1, X_GLrop_EvalPoint1, GLint)
+glxproto_2s(EvalPoint2, X_GLrop_EvalPoint2, GLint)
+
+glxproto_enum1_1s(AlphaFunc, X_GLrop_AlphaFunc, GLclampf)
+
+glxproto_2s(BlendFunc,         X_GLrop_BlendFunc,         GLenum)
+glxproto_4s(BlendFuncSeparate, X_GLrop_BlendFuncSeparate, GLenum)
+
+glxproto_1s(LogicOp, X_GLrop_LogicOp, GLenum)
+
+glxproto_3s(StencilOp, X_GLrop_StencilOp, GLenum)
+glxproto_1s(DepthFunc, X_GLrop_DepthFunc, GLenum)
+
+glxproto_2s(PixelZoom, X_GLrop_PixelZoom, GLfloat)
+
+glxproto_enum1_1s(PixelTransferf, X_GLrop_PixelTransferf, GLfloat)
+glxproto_enum1_1s(PixelTransferi, X_GLrop_PixelTransferi, GLint)
+
+glxproto_1s(ReadBuffer, X_GLrop_ReadBuffer, GLenum)
+
+glxproto_2s(DepthRange, X_GLrop_DepthRange, GLclampd)
+
+glxproto_6s(Frustum, X_GLrop_Frustum, GLdouble)
+
+glxproto_void(LoadIdentity, X_GLrop_LoadIdentity)
+glxproto_1s(MatrixMode, X_GLrop_MatrixMode, GLenum)
+glxproto_Cv(LoadMatrixf, X_GLrop_LoadMatrixf, GLfloat, 16)
+glxproto_Cv(MultMatrixf, X_GLrop_MultMatrixf, GLfloat, 16)
+glxproto_Cv(LoadMatrixd, X_GLrop_LoadMatrixd, GLdouble, 16)
+glxproto_Cv(MultMatrixd, X_GLrop_MultMatrixd, GLdouble, 16)
+glxproto_Cv_transpose(LoadTransposeMatrixfARB, X_GLrop_LoadMatrixf, GLfloat, 4)
+glxproto_Cv_transpose(MultTransposeMatrixfARB, X_GLrop_MultMatrixf, GLfloat, 4)
+glxproto_Cv_transpose(LoadTransposeMatrixdARB, X_GLrop_LoadMatrixd, GLdouble, 4)
+glxproto_Cv_transpose(MultTransposeMatrixdARB, X_GLrop_MultMatrixd, GLdouble, 4)
+
+glxproto_6s(Ortho, X_GLrop_Ortho, GLdouble)
+
+glxproto_void(PushMatrix, X_GLrop_PushMatrix)
+glxproto_void(PopMatrix,  X_GLrop_PopMatrix)
+
+glxproto_4s(Rotatef,    X_GLrop_Rotatef,    GLfloat)
+glxproto_3s(Scalef,     X_GLrop_Scalef,     GLfloat)
+glxproto_3s(Translatef, X_GLrop_Translatef, GLfloat)
+glxproto_4s(Rotated,    X_GLrop_Rotated,    GLdouble)
+glxproto_3s(Scaled,     X_GLrop_Scaled,     GLdouble)
+glxproto_3s(Translated, X_GLrop_Translated, GLdouble)
+
+glxproto_2s(PolygonOffset, X_GLrop_PolygonOffset, GLfloat)
+
+glxproto_enum1_1s(BindTexture, X_GLrop_BindTexture, GLuint)
+
+glxproto_4s(BlendColor,    X_GLrop_BlendColor,    GLclampf)
+glxproto_1s(BlendEquation, X_GLrop_BlendEquation, GLenum)
+
+glxproto_enum2_Vv(ColorTableParameteriv, X_GLrop_ColorTableParameteriv, GLint)
+glxproto_enum2_Vv(ColorTableParameterfv, X_GLrop_ColorTableParameterfv, GLfloat)
+
+glxproto_enum2_V(ConvolutionParameteri, X_GLrop_ConvolutionParameteri, GLint)
+glxproto_enum2_V(ConvolutionParameterf, X_GLrop_ConvolutionParameterf, GLfloat)
+
+glxproto_enum2_1s(Minmax, X_GLrop_Minmax, GLboolean)
+
+glxproto_1s(ResetHistogram, X_GLrop_ResetHistogram, GLenum)
+glxproto_1s(ResetMinmax,    X_GLrop_ResetMinmax,    GLenum)
+
+glxproto_1s(     ActiveTextureARB, X_GLrop_ActiveTextureARB,    GLenum)
+glxvendr_enum1_1(MultiTexCoord1s,  X_GLrop_MultiTexCoord1svARB, GLshort,  ARB)
+glxvendr_enum1_1(MultiTexCoord1i,  X_GLrop_MultiTexCoord1ivARB, GLint,    ARB)
+glxvendr_enum1_1(MultiTexCoord1f,  X_GLrop_MultiTexCoord1fvARB, GLfloat,  ARB)
+glxvendr_enum1_1(MultiTexCoord1d,  X_GLrop_MultiTexCoord1dvARB, GLdouble, ARB)
+glxvendr_enum1_2(MultiTexCoord2s,  X_GLrop_MultiTexCoord2svARB, GLshort,  ARB)
+glxvendr_enum1_2(MultiTexCoord2i,  X_GLrop_MultiTexCoord2ivARB, GLint,    ARB)
+glxvendr_enum1_2(MultiTexCoord2f,  X_GLrop_MultiTexCoord2fvARB, GLfloat,  ARB)
+glxvendr_enum1_2(MultiTexCoord2d,  X_GLrop_MultiTexCoord2dvARB, GLdouble, ARB)
+glxvendr_enum1_3(MultiTexCoord3s,  X_GLrop_MultiTexCoord3svARB, GLshort,  ARB)
+glxvendr_enum1_3(MultiTexCoord3i,  X_GLrop_MultiTexCoord3ivARB, GLint,    ARB)
+glxvendr_enum1_3(MultiTexCoord3f,  X_GLrop_MultiTexCoord3fvARB, GLfloat,  ARB)
+glxvendr_enum1_3(MultiTexCoord3d,  X_GLrop_MultiTexCoord3dvARB, GLdouble, ARB)
+glxvendr_enum1_4(MultiTexCoord4s,  X_GLrop_MultiTexCoord4svARB, GLshort,  ARB)
+glxvendr_enum1_4(MultiTexCoord4i,  X_GLrop_MultiTexCoord4ivARB, GLint,    ARB)
+glxvendr_enum1_4(MultiTexCoord4f,  X_GLrop_MultiTexCoord4fvARB, GLfloat,  ARB)
+glxvendr_enum1_4(MultiTexCoord4d,  X_GLrop_MultiTexCoord4dvARB, GLdouble, ARB)
+
+glxvendr_enum1_V(PointParameterf, X_GLrop_PointParameterf, GLfloat, ARB)
+glxproto_enum1_V(PointParameteri, X_GLrop_PointParameteri, GLint)
+
+glxvendr_3(WindowPos3f, X_GLrop_WindowPos3fARB, GLfloat, ARB)
+
+glxproto_1s(ActiveStencilFaceEXT, X_GLrop_ActiveStencilFaceEXT, GLenum)
+
+glxproto_4s(Rects, X_GLrop_Rectsv, GLshort)
+glxproto_4s(Recti, X_GLrop_Rectiv, GLint)
+glxproto_4s(Rectf, X_GLrop_Rectfv, GLfloat)
+glxproto_4s(Rectd, X_GLrop_Rectdv, GLdouble)
+
+#if !defined( GENERATE_GLX_PROTOCOL_FUNCTIONS )
 GLboolean __indirect_glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences);
 GLboolean __indirect_glAreTexturesResidentEXT(GLsizei n, const GLuint *textures, GLboolean *residences);
 void __indirect_glArrayElement(GLint i);
-void __indirect_glBegin(GLenum mode);
-void __indirect_glBindTexture(GLenum target, GLuint texture);
 void __indirect_glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
-void __indirect_glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-void __indirect_glBlendEquation(GLenum mode);
-void __indirect_glBlendFunc(GLenum sfactor, GLenum dfactor);
-void __indirect_glCallList(GLuint list);
 void __indirect_glCallLists(GLsizei n, GLenum type, const GLvoid *lists);
-void __indirect_glClear(GLbitfield mask);
-void __indirect_glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-void __indirect_glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-void __indirect_glClearDepth(GLclampd depth);
-void __indirect_glClearIndex(GLfloat c);
-void __indirect_glClearStencil(GLint s);
-void __indirect_glClipPlane(GLenum plane, const GLdouble *equation);
-void __indirect_glColor3b(GLbyte red, GLbyte green, GLbyte blue);
-void __indirect_glColor3bv(const GLbyte *v);
-void __indirect_glColor3d(GLdouble red, GLdouble green, GLdouble blue);
-void __indirect_glColor3dv(const GLdouble *v);
-void __indirect_glColor3f(GLfloat red, GLfloat green, GLfloat blue);
-void __indirect_glColor3fv(const GLfloat *v);
-void __indirect_glColor3i(GLint red, GLint green, GLint blue);
-void __indirect_glColor3iv(const GLint *v);
-void __indirect_glColor3s(GLshort red, GLshort green, GLshort blue);
-void __indirect_glColor3sv(const GLshort *v);
-void __indirect_glColor3ub(GLubyte red, GLubyte green, GLubyte blue);
-void __indirect_glColor3ubv(const GLubyte *v);
-void __indirect_glColor3ui(GLuint red, GLuint green, GLuint blue);
-void __indirect_glColor3uiv(const GLuint *v);
-void __indirect_glColor3us(GLushort red, GLushort green, GLushort blue);
-void __indirect_glColor3usv(const GLushort *v);
-void __indirect_glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
-void __indirect_glColor4bv(const GLbyte *v);
-void __indirect_glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
-void __indirect_glColor4dv(const GLdouble *v);
-void __indirect_glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-void __indirect_glColor4fv(const GLfloat *v);
-void __indirect_glColor4i(GLint red, GLint green, GLint blue, GLint alpha);
-void __indirect_glColor4iv(const GLint *v);
-void __indirect_glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha);
-void __indirect_glColor4sv(const GLshort *v);
-void __indirect_glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-void __indirect_glColor4ubv(const GLubyte *v);
-void __indirect_glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha);
-void __indirect_glColor4uiv(const GLuint *v);
-void __indirect_glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha);
-void __indirect_glColor4usv(const GLushort *v);
-void __indirect_glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-void __indirect_glColorMaterial(GLenum face, GLenum mode);
 void __indirect_glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
 void __indirect_glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *table);
 void __indirect_glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-void __indirect_glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
-void __indirect_glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
 void __indirect_glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
 void __indirect_glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-void __indirect_glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params);
-void __indirect_glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params);
-void __indirect_glConvolutionParameteri(GLenum target, GLenum pname, GLint params);
-void __indirect_glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params);
 void __indirect_glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
 void __indirect_glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
 void __indirect_glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
@@ -114,48 +437,22 @@ void __indirect_glCopyTexImage2D(GLenum target, GLint level, GLenum internalform
 void __indirect_glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
 void __indirect_glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 void __indirect_glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-void __indirect_glCullFace(GLenum mode);
 void __indirect_glDeleteLists(GLuint list, GLsizei range);
 void __indirect_glDeleteTextures(GLsizei n, const GLuint *textures);
 void __indirect_glDeleteTexturesEXT(GLsizei n, const GLuint *textures);
-void __indirect_glDepthFunc(GLenum func);
-void __indirect_glDepthMask(GLboolean flag);
-void __indirect_glDepthRange(GLclampd zNear, GLclampd zFar);
 void __indirect_glDisable(GLenum cap);
 void __indirect_glDisableClientState(GLenum array);
 void __indirect_glDrawArrays(GLenum mode, GLint first, GLsizei count);
-void __indirect_glDrawBuffer(GLenum mode);
 void __indirect_glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
 void __indirect_glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
 void __indirect_glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-void __indirect_glEdgeFlag(GLboolean flag);
 void __indirect_glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer);
-void __indirect_glEdgeFlagv(const GLboolean *flag);
 void __indirect_glEnable(GLenum cap);
 void __indirect_glEnableClientState(GLenum array);
-void __indirect_glEnd(void);
 void __indirect_glEndList(void);
-void __indirect_glEvalCoord1d(GLdouble u);
-void __indirect_glEvalCoord1dv(const GLdouble *u);
-void __indirect_glEvalCoord1f(GLfloat u);
-void __indirect_glEvalCoord1fv(const GLfloat *u);
-void __indirect_glEvalCoord2d(GLdouble u, GLdouble v);
-void __indirect_glEvalCoord2dv(const GLdouble *u);
-void __indirect_glEvalCoord2f(GLfloat u, GLfloat v);
-void __indirect_glEvalCoord2fv(const GLfloat *u);
-void __indirect_glEvalMesh1(GLenum mode, GLint i1, GLint i2);
-void __indirect_glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
-void __indirect_glEvalPoint1(GLint i);
-void __indirect_glEvalPoint2(GLint i, GLint j);
 void __indirect_glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer);
 void __indirect_glFinish(void);
 void __indirect_glFlush(void);
-void __indirect_glFogf(GLenum pname, GLfloat param);
-void __indirect_glFogfv(GLenum pname, const GLfloat *params);
-void __indirect_glFogi(GLenum pname, GLint param);
-void __indirect_glFogiv(GLenum pname, const GLint *params);
-void __indirect_glFrontFace(GLenum mode);
-void __indirect_glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
 GLuint __indirect_glGenLists(GLsizei range);
 void __indirect_glGenTextures(GLsizei n, GLuint *textures);
 void __indirect_glGenTexturesEXT(GLsizei n, GLuint *textures);
@@ -201,42 +498,14 @@ void __indirect_glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pnam
 void __indirect_glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params);
 void __indirect_glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params);
 void __indirect_glGetTexParameteriv(GLenum target, GLenum pname, GLint *params);
-void __indirect_glHint(GLenum target, GLenum mode);
 void __indirect_glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-void __indirect_glIndexMask(GLuint mask);
 void __indirect_glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer);
-void __indirect_glIndexd(GLdouble c);
-void __indirect_glIndexdv(const GLdouble *c);
-void __indirect_glIndexf(GLfloat c);
-void __indirect_glIndexfv(const GLfloat *c);
-void __indirect_glIndexi(GLint c);
-void __indirect_glIndexiv(const GLint *c);
-void __indirect_glIndexs(GLshort c);
-void __indirect_glIndexsv(const GLshort *c);
-void __indirect_glIndexub(GLubyte c);
-void __indirect_glIndexubv(const GLubyte *c);
-void __indirect_glInitNames(void);
 void __indirect_glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
 GLboolean __indirect_glIsEnabled(GLenum cap);
 GLboolean __indirect_glIsList(GLuint list);
 GLboolean __indirect_glIsTexture(GLuint texture);
 GLboolean __indirect_glIsTextureEXT(GLuint texture);
-void __indirect_glLightModelf(GLenum pname, GLfloat param);
-void __indirect_glLightModelfv(GLenum pname, const GLfloat *params);
-void __indirect_glLightModeli(GLenum pname, GLint param);
-void __indirect_glLightModeliv(GLenum pname, const GLint *params);
-void __indirect_glLightf(GLenum light, GLenum pname, GLfloat param);
-void __indirect_glLightfv(GLenum light, GLenum pname, const GLfloat *params);
-void __indirect_glLighti(GLenum light, GLenum pname, GLint param);
-void __indirect_glLightiv(GLenum light, GLenum pname, const GLint *params);
 void __indirect_glLineStipple(GLint factor, GLushort pattern);
-void __indirect_glLineWidth(GLfloat width);
-void __indirect_glListBase(GLuint base);
-void __indirect_glLoadIdentity(void);
-void __indirect_glLoadMatrixd(const GLdouble *m);
-void __indirect_glLoadMatrixf(const GLfloat *m);
-void __indirect_glLoadName(GLuint name);
-void __indirect_glLogicOp(GLenum opcode);
 void __indirect_glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *pnts);
 void __indirect_glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *pnts);
 void __indirect_glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustr, GLint uord, GLdouble v1, GLdouble v2, GLint vstr, GLint vord, const GLdouble *pnts);
@@ -245,227 +514,41 @@ void __indirect_glMapGrid1d(GLint un, GLdouble u1, GLdouble u2);
 void __indirect_glMapGrid1f(GLint un, GLfloat u1, GLfloat u2);
 void __indirect_glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
 void __indirect_glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
-void __indirect_glMaterialf(GLenum face, GLenum pname, GLfloat param);
-void __indirect_glMaterialfv(GLenum face, GLenum pname, const GLfloat *params);
-void __indirect_glMateriali(GLenum face, GLenum pname, GLint param);
-void __indirect_glMaterialiv(GLenum face, GLenum pname, const GLint *params);
-void __indirect_glMatrixMode(GLenum mode);
-void __indirect_glMinmax(GLenum target, GLenum internalformat, GLboolean sink);
-void __indirect_glMultMatrixd(const GLdouble *m);
-void __indirect_glMultMatrixf(const GLfloat *m);
 void __indirect_glNewList(GLuint list, GLenum mode);
-void __indirect_glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz);
-void __indirect_glNormal3bv(const GLbyte *v);
-void __indirect_glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz);
-void __indirect_glNormal3dv(const GLdouble *v);
-void __indirect_glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz);
-void __indirect_glNormal3fv(const GLfloat *v);
-void __indirect_glNormal3i(GLint nx, GLint ny, GLint nz);
-void __indirect_glNormal3iv(const GLint *v);
-void __indirect_glNormal3s(GLshort nx, GLshort ny, GLshort nz);
-void __indirect_glNormal3sv(const GLshort *v);
 void __indirect_glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer);
-void __indirect_glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-void __indirect_glPassThrough(GLfloat token);
 void __indirect_glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values);
 void __indirect_glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values);
 void __indirect_glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values);
 void __indirect_glPixelStoref(GLenum pname, GLfloat param);
 void __indirect_glPixelStorei(GLenum pname, GLint param);
-void __indirect_glPixelTransferf(GLenum pname, GLfloat param);
-void __indirect_glPixelTransferi(GLenum pname, GLint param);
-void __indirect_glPixelZoom(GLfloat xfactor, GLfloat yfactor);
-void __indirect_glPointSize(GLfloat size);
-void __indirect_glPolygonMode(GLenum face, GLenum mode);
-void __indirect_glPolygonOffset(GLfloat factor, GLfloat units);
 void __indirect_glPolygonStipple(const GLubyte *mask);
-void __indirect_glPopAttrib(void);
 void __indirect_glPopClientAttrib(void);
-void __indirect_glPopMatrix(void);
-void __indirect_glPopName(void);
 void __indirect_glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLclampf *priorities);
-void __indirect_glPushAttrib(GLbitfield mask);
 void __indirect_glPushClientAttrib(GLuint mask);
-void __indirect_glPushMatrix(void);
-void __indirect_glPushName(GLuint name);
-void __indirect_glRasterPos2d(GLdouble x, GLdouble y);
-void __indirect_glRasterPos2dv(const GLdouble *v);
-void __indirect_glRasterPos2f(GLfloat x, GLfloat y);
-void __indirect_glRasterPos2fv(const GLfloat *v);
-void __indirect_glRasterPos2i(GLint x, GLint y);
-void __indirect_glRasterPos2iv(const GLint *v);
-void __indirect_glRasterPos2s(GLshort x, GLshort y);
-void __indirect_glRasterPos2sv(const GLshort *v);
-void __indirect_glRasterPos3d(GLdouble x, GLdouble y, GLdouble z);
-void __indirect_glRasterPos3dv(const GLdouble *v);
-void __indirect_glRasterPos3f(GLfloat x, GLfloat y, GLfloat z);
-void __indirect_glRasterPos3fv(const GLfloat *v);
-void __indirect_glRasterPos3i(GLint x, GLint y, GLint z);
-void __indirect_glRasterPos3iv(const GLint *v);
-void __indirect_glRasterPos3s(GLshort x, GLshort y, GLshort z);
-void __indirect_glRasterPos3sv(const GLshort *v);
-void __indirect_glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-void __indirect_glRasterPos4dv(const GLdouble *v);
-void __indirect_glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-void __indirect_glRasterPos4fv(const GLfloat *v);
-void __indirect_glRasterPos4i(GLint x, GLint y, GLint z, GLint w);
-void __indirect_glRasterPos4iv(const GLint *v);
-void __indirect_glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w);
-void __indirect_glRasterPos4sv(const GLshort *v);
-void __indirect_glReadBuffer(GLenum mode);
 void __indirect_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-void __indirect_glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
 void __indirect_glRectdv(const GLdouble *v1, const GLdouble *v2);
-void __indirect_glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
 void __indirect_glRectfv(const GLfloat *v1, const GLfloat *v2);
-void __indirect_glRecti(GLint x1, GLint y1, GLint x2, GLint y2);
 void __indirect_glRectiv(const GLint *v1, const GLint *v2);
-void __indirect_glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
 void __indirect_glRectsv(const GLshort *v1, const GLshort *v2);
 GLint __indirect_glRenderMode(GLenum mode);
-void __indirect_glResetHistogram(GLenum target);
-void __indirect_glResetMinmax(GLenum target);
-void __indirect_glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-void __indirect_glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-void __indirect_glScaled(GLdouble x, GLdouble y, GLdouble z);
-void __indirect_glScalef(GLfloat x, GLfloat y, GLfloat z);
 void __indirect_glScissor(GLint x, GLint y, GLsizei width, GLsizei height);
 void __indirect_glSelectBuffer(GLsizei numnames, GLuint *buffer);
 void __indirect_glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-void __indirect_glShadeModel(GLenum mode);
 void __indirect_glStencilFunc(GLenum func, GLint ref, GLuint mask);
-void __indirect_glStencilMask(GLuint mask);
-void __indirect_glStencilOp(GLenum fail, GLenum zfail, GLenum zpass);
-void __indirect_glTexCoord1d(GLdouble s);
-void __indirect_glTexCoord1dv(const GLdouble *v);
-void __indirect_glTexCoord1f(GLfloat s);
-void __indirect_glTexCoord1fv(const GLfloat *v);
-void __indirect_glTexCoord1i(GLint s);
-void __indirect_glTexCoord1iv(const GLint *v);
-void __indirect_glTexCoord1s(GLshort s);
-void __indirect_glTexCoord1sv(const GLshort *v);
-void __indirect_glTexCoord2d(GLdouble s, GLdouble t);
-void __indirect_glTexCoord2dv(const GLdouble *v);
-void __indirect_glTexCoord2f(GLfloat s, GLfloat t);
-void __indirect_glTexCoord2fv(const GLfloat *v);
-void __indirect_glTexCoord2i(GLint s, GLint t);
-void __indirect_glTexCoord2iv(const GLint *v);
-void __indirect_glTexCoord2s(GLshort s, GLshort t);
-void __indirect_glTexCoord2sv(const GLshort *v);
-void __indirect_glTexCoord3d(GLdouble s, GLdouble t, GLdouble r);
-void __indirect_glTexCoord3dv(const GLdouble *v);
-void __indirect_glTexCoord3f(GLfloat s, GLfloat t, GLfloat r);
-void __indirect_glTexCoord3fv(const GLfloat *v);
-void __indirect_glTexCoord3i(GLint s, GLint t, GLint r);
-void __indirect_glTexCoord3iv(const GLint *v);
-void __indirect_glTexCoord3s(GLshort s, GLshort t, GLshort r);
-void __indirect_glTexCoord3sv(const GLshort *v);
-void __indirect_glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-void __indirect_glTexCoord4dv(const GLdouble *v);
-void __indirect_glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-void __indirect_glTexCoord4fv(const GLfloat *v);
-void __indirect_glTexCoord4i(GLint s, GLint t, GLint r, GLint q);
-void __indirect_glTexCoord4iv(const GLint *v);
-void __indirect_glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q);
-void __indirect_glTexCoord4sv(const GLshort *v);
 void __indirect_glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-void __indirect_glTexEnvf(GLenum target, GLenum pname, GLfloat param);
-void __indirect_glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params);
-void __indirect_glTexEnvi(GLenum target, GLenum pname, GLint param);
-void __indirect_glTexEnviv(GLenum target, GLenum pname, const GLint *params);
-void __indirect_glTexGend(GLenum coord, GLenum pname, GLdouble param);
-void __indirect_glTexGendv(GLenum coord, GLenum pname, const GLdouble *params);
-void __indirect_glTexGenf(GLenum coord, GLenum pname, GLfloat param);
-void __indirect_glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params);
-void __indirect_glTexGeni(GLenum coord, GLenum pname, GLint param);
-void __indirect_glTexGeniv(GLenum coord, GLenum pname, const GLint *params);
 void __indirect_glTexImage1D(GLenum target, GLint level, GLint components, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *image);
 void __indirect_glTexImage2D(GLenum target, GLint level, GLint components, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *image);
 void __indirect_glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *image);
-void __indirect_glTexParameterf(GLenum target, GLenum pname, GLfloat param);
-void __indirect_glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params);
-void __indirect_glTexParameteri(GLenum target, GLenum pname, GLint param);
-void __indirect_glTexParameteriv(GLenum target, GLenum pname, const GLint *params);
 void __indirect_glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
 void __indirect_glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
 void __indirect_glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *image);
-void __indirect_glTranslated(GLdouble x, GLdouble y, GLdouble z);
-void __indirect_glTranslatef(GLfloat x, GLfloat y, GLfloat z);
-void __indirect_glVertex2d(GLdouble x, GLdouble y);
-void __indirect_glVertex2dv(const GLdouble *v);
-void __indirect_glVertex2f(GLfloat x, GLfloat y);
-void __indirect_glVertex2fv(const GLfloat *v);
-void __indirect_glVertex2i(GLint x, GLint y);
-void __indirect_glVertex2iv(const GLint *v);
-void __indirect_glVertex2s(GLshort x, GLshort y);
-void __indirect_glVertex2sv(const GLshort *v);
-void __indirect_glVertex3d(GLdouble x, GLdouble y, GLdouble z);
-void __indirect_glVertex3dv(const GLdouble *v);
-void __indirect_glVertex3f(GLfloat x, GLfloat y, GLfloat z);
-void __indirect_glVertex3fv(const GLfloat *v);
-void __indirect_glVertex3i(GLint x, GLint y, GLint z);
-void __indirect_glVertex3iv(const GLint *v);
-void __indirect_glVertex3s(GLshort x, GLshort y, GLshort z);
-void __indirect_glVertex3sv(const GLshort *v);
-void __indirect_glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-void __indirect_glVertex4dv(const GLdouble *v);
-void __indirect_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-void __indirect_glVertex4fv(const GLfloat *v);
-void __indirect_glVertex4i(GLint x, GLint y, GLint z, GLint w);
-void __indirect_glVertex4iv(const GLint *v);
-void __indirect_glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w);
-void __indirect_glVertex4sv(const GLshort *v);
 void __indirect_glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
 void __indirect_glViewport(GLint x, GLint y, GLsizei width, GLsizei height);
 
-
-void __indirect_glActiveTextureARB(GLenum texture);
 void __indirect_glClientActiveTextureARB(GLenum texture);
-void __indirect_glMultiTexCoord1dARB(GLenum target, GLdouble s);
-void __indirect_glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
-void __indirect_glMultiTexCoord1fARB(GLenum target, GLfloat s);
-void __indirect_glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
-void __indirect_glMultiTexCoord1iARB(GLenum target, GLint s);
-void __indirect_glMultiTexCoord1ivARB(GLenum target, const GLint *v);
-void __indirect_glMultiTexCoord1sARB(GLenum target, GLshort s);
-void __indirect_glMultiTexCoord1svARB(GLenum target, const GLshort *v);
-void __indirect_glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
-void __indirect_glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
-void __indirect_glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
-void __indirect_glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
-void __indirect_glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
-void __indirect_glMultiTexCoord2ivARB(GLenum target, const GLint *v);
-void __indirect_glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
-void __indirect_glMultiTexCoord2svARB(GLenum target, const GLshort *v);
-void __indirect_glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
-void __indirect_glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
-void __indirect_glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
-void __indirect_glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
-void __indirect_glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
-void __indirect_glMultiTexCoord3ivARB(GLenum target, const GLint *v);
-void __indirect_glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
-void __indirect_glMultiTexCoord3svARB(GLenum target, const GLshort *v);
-void __indirect_glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-void __indirect_glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
-void __indirect_glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-void __indirect_glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
-void __indirect_glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
-void __indirect_glMultiTexCoord4ivARB(GLenum target, const GLint *v);
-void __indirect_glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-void __indirect_glMultiTexCoord4svARB(GLenum target, const GLshort *v);
-
-
-void __indirect_glLoadTransposeMatrixfARB(const GLfloat *m);
-void __indirect_glMultTransposeMatrixfARB(const GLfloat *m);
-void __indirect_glLoadTransposeMatrixdARB(const GLdouble *m);
-void __indirect_glMultTransposeMatrixdARB(const GLdouble *m);
 
 void __indirect_glSampleCoverageARB( GLfloat value, GLboolean invert );
 
-void __indirect_glPointParameterfARB(GLenum pname, GLfloat param);
-void __indirect_glPointParameterfvARB(GLenum pname, const GLfloat *params);
-void __indirect_glActiveStencilFaceEXT(GLenum mode);
-
 void __indirect_glWindowPos2dARB(GLdouble x, GLdouble y);
 void __indirect_glWindowPos2iARB(GLint x, GLint y);
 void __indirect_glWindowPos2fARB(GLfloat x, GLfloat y);
@@ -475,53 +558,64 @@ void __indirect_glWindowPos2fvARB(const GLfloat * p);
 void __indirect_glWindowPos2ivARB(const GLint * p);
 void __indirect_glWindowPos2svARB(const GLshort * p);
 void __indirect_glWindowPos3dARB(GLdouble x, GLdouble y, GLdouble z);
-void __indirect_glWindowPos3fARB(GLfloat x, GLfloat y, GLfloat z);
 void __indirect_glWindowPos3iARB(GLint x, GLint y, GLint z);
 void __indirect_glWindowPos3sARB(GLshort x, GLshort y, GLshort z);
 void __indirect_glWindowPos3dvARB(const GLdouble * p);
-void __indirect_glWindowPos3fvARB(const GLfloat * p);
 void __indirect_glWindowPos3ivARB(const GLint * p);
 void __indirect_glWindowPos3svARB(const GLshort * p);
 
 void __indirect_glMultiDrawArrays(GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
 void __indirect_glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid ** indices, GLsizei primcount);
 
-void __indirect_glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB,GLenum sfactorA, GLenum dfactorA);
-
 void __indirect_glSampleMaskSGIS( GLfloat value, GLboolean invert );
 void __indirect_glSamplePatternSGIS( GLenum pass );
 
 /* 145. GL_EXT_secondary_color / GL 1.4 */
 
-void __indirect_glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-void __indirect_glSecondaryColor3bv (const GLbyte *);
-void __indirect_glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-void __indirect_glSecondaryColor3dv (const GLdouble *);
-void __indirect_glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-void __indirect_glSecondaryColor3fv (const GLfloat *);
-void __indirect_glSecondaryColor3i (GLint, GLint, GLint);
-void __indirect_glSecondaryColor3iv (const GLint *);
-void __indirect_glSecondaryColor3s (GLshort, GLshort, GLshort);
-void __indirect_glSecondaryColor3sv (const GLshort *);
-void __indirect_glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-void __indirect_glSecondaryColor3ubv (const GLubyte *);
-void __indirect_glSecondaryColor3ui (GLuint, GLuint, GLuint);
-void __indirect_glSecondaryColor3uiv (const GLuint *);
-void __indirect_glSecondaryColor3us (GLushort, GLushort, GLushort);
-void __indirect_glSecondaryColor3usv (const GLushort *);
 void __indirect_glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
 
 /* 149. GL_EXT_fog_coord / GL 1.4 */
 
-void __indirect_glFogCoordf (GLfloat);
-void __indirect_glFogCoordfv (const GLfloat *);
-void __indirect_glFogCoordd (GLdouble);
-void __indirect_glFogCoorddv (const GLdouble *);
 void __indirect_glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
 
-/* 262. GL_NV_point_sprite / GL 1.4 */
-
-void __indirect_glPointParameteri(GLenum pname, GLint param);
-void __indirect_glPointParameteriv(GLenum pname, const GLint *params);
+# undef glxproto_void
+# undef glxproto_Cv
+# undef glxproto_Cv_transpose
+# undef glxproto_1s
+# undef glxproto_2s
+# undef glxproto_3s
+# undef glxproto_4s
+# undef glxproto_6s
+# undef glxproto_enum1_1s
+# undef glxproto_enum1_1v
+# undef glxproto_enum1_2s
+# undef glxproto_enum1_2v
+# undef glxproto_enum1_3s
+# undef glxproto_enum1_3v
+# undef glxproto_enum1_4s
+# undef glxproto_enum1_4v
+# undef glxproto_enum1_Vv
+# undef glxproto_enum2_1s
+# undef glxproto_enum2_Vv
+# undef glxproto_1
+# undef glxvendr_1
+# undef glxproto_2
+# undef glxvendr_2
+# undef glxproto_3
+# undef glxvendr_3
+# undef glxproto_4
+# undef glxproto_enum1_1
+# undef glxvendr_enum1_1
+# undef glxproto_enum1_2
+# undef glxvendr_enum1_2
+# undef glxproto_enum1_3
+# undef glxvendr_enum1_3
+# undef glxproto_enum1_4
+# undef glxvendr_enum1_4
+# undef glxproto_enum1_V
+# undef glxvendr_enum1_V
+# undef glxproto_enum2_V
+# undef glxvendr_enum2_V
+#endif /* !defined( GENERATE_GLX_PROTOCOL_FUNCTIONS ) */
 
 #endif /* _INDIRECT_H_ */