diff options
Diffstat (limited to 'xorg-server/glx/indirect_dispatch.c')
| -rw-r--r-- | xorg-server/glx/indirect_dispatch.c | 3126 |
1 files changed, 1043 insertions, 2083 deletions
diff --git a/xorg-server/glx/indirect_dispatch.c b/xorg-server/glx/indirect_dispatch.c index 0a7623cf2..1eee79a52 100644 --- a/xorg-server/glx/indirect_dispatch.c +++ b/xorg-server/glx/indirect_dispatch.c @@ -25,21 +25,14 @@ * SOFTWARE. */ -#include <X11/Xmd.h> -#include <GL/gl.h> -#include <GL/glxproto.h> #include <inttypes.h> +#include "glxserver.h" #include "indirect_size.h" #include "indirect_size_get.h" #include "indirect_dispatch.h" -#include "glxserver.h" #include "glxbyteorder.h" #include "indirect_util.h" #include "singlesize.h" -#include "glapi.h" -#include "glapitable.h" -#include "glthread.h" -#include "dispatch.h" #define __GLX_PAD(x) (((x) + 3) & ~3) @@ -61,8 +54,7 @@ __glXDisp_NewList(__GLXclientState * cl, GLbyte * pc) pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { - CALL_NewList(GET_DISPATCH(), (*(GLuint *) (pc + 0), *(GLenum *) (pc + 4) - )); + glNewList(*(GLuint *) (pc + 0), *(GLenum *) (pc + 4)); error = Success; } @@ -78,7 +70,7 @@ __glXDisp_EndList(__GLXclientState * cl, GLbyte * pc) pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { - CALL_EndList(GET_DISPATCH(), ()); + glEndList(); error = Success; } @@ -88,8 +80,7 @@ __glXDisp_EndList(__GLXclientState * cl, GLbyte * pc) void __glXDisp_CallList(GLbyte * pc) { - CALL_CallList(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + glCallList(*(GLuint *) (pc + 0)); } void @@ -101,7 +92,7 @@ __glXDisp_CallLists(GLbyte * pc) lists = (const GLvoid *) (pc + 8); - CALL_CallLists(GET_DISPATCH(), (n, type, lists)); + glCallLists(n, type, lists); } int @@ -113,9 +104,7 @@ __glXDisp_DeleteLists(__GLXclientState * cl, GLbyte * pc) pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { - CALL_DeleteLists(GET_DISPATCH(), (*(GLuint *) (pc + 0), - *(GLsizei *) (pc + 4) - )); + glDeleteLists(*(GLuint *) (pc + 0), *(GLsizei *) (pc + 4)); error = Success; } @@ -133,8 +122,7 @@ __glXDisp_GenLists(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { GLuint retval; - retval = CALL_GenLists(GET_DISPATCH(), (*(GLsizei *) (pc + 0) - )); + retval = glGenLists(*(GLsizei *) (pc + 0)); __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -145,15 +133,13 @@ __glXDisp_GenLists(__GLXclientState * cl, GLbyte * pc) void __glXDisp_ListBase(GLbyte * pc) { - CALL_ListBase(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + glListBase(*(GLuint *) (pc + 0)); } void __glXDisp_Begin(GLbyte * pc) { - CALL_Begin(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glBegin(*(GLenum *) (pc + 0)); } void @@ -162,29 +148,23 @@ __glXDisp_Bitmap(GLbyte * pc) const GLubyte *const bitmap = (const GLubyte *) ((pc + 44)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_Bitmap(GET_DISPATCH(), (*(GLsizei *) (pc + 20), - *(GLsizei *) (pc + 24), - *(GLfloat *) (pc + 28), - *(GLfloat *) (pc + 32), - *(GLfloat *) (pc + 36), - *(GLfloat *) (pc + 40), bitmap)); + glBitmap(*(GLsizei *) (pc + 20), + *(GLsizei *) (pc + 24), + *(GLfloat *) (pc + 28), + *(GLfloat *) (pc + 32), + *(GLfloat *) (pc + 36), *(GLfloat *) (pc + 40), bitmap); } void __glXDisp_Color3bv(GLbyte * pc) { - CALL_Color3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0) - )); + glColor3bv((const GLbyte *) (pc + 0)); } void @@ -197,57 +177,49 @@ __glXDisp_Color3dv(GLbyte * pc) } #endif - CALL_Color3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glColor3dv((const GLdouble *) (pc + 0)); } void __glXDisp_Color3fv(GLbyte * pc) { - CALL_Color3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glColor3fv((const GLfloat *) (pc + 0)); } void __glXDisp_Color3iv(GLbyte * pc) { - CALL_Color3iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glColor3iv((const GLint *) (pc + 0)); } void __glXDisp_Color3sv(GLbyte * pc) { - CALL_Color3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glColor3sv((const GLshort *) (pc + 0)); } void __glXDisp_Color3ubv(GLbyte * pc) { - CALL_Color3ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0) - )); + glColor3ubv((const GLubyte *) (pc + 0)); } void __glXDisp_Color3uiv(GLbyte * pc) { - CALL_Color3uiv(GET_DISPATCH(), ((const GLuint *) (pc + 0) - )); + glColor3uiv((const GLuint *) (pc + 0)); } void __glXDisp_Color3usv(GLbyte * pc) { - CALL_Color3usv(GET_DISPATCH(), ((const GLushort *) (pc + 0) - )); + glColor3usv((const GLushort *) (pc + 0)); } void __glXDisp_Color4bv(GLbyte * pc) { - CALL_Color4bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0) - )); + glColor4bv((const GLbyte *) (pc + 0)); } void @@ -260,63 +232,55 @@ __glXDisp_Color4dv(GLbyte * pc) } #endif - CALL_Color4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glColor4dv((const GLdouble *) (pc + 0)); } void __glXDisp_Color4fv(GLbyte * pc) { - CALL_Color4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glColor4fv((const GLfloat *) (pc + 0)); } void __glXDisp_Color4iv(GLbyte * pc) { - CALL_Color4iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glColor4iv((const GLint *) (pc + 0)); } void __glXDisp_Color4sv(GLbyte * pc) { - CALL_Color4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glColor4sv((const GLshort *) (pc + 0)); } void __glXDisp_Color4ubv(GLbyte * pc) { - CALL_Color4ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0) - )); + glColor4ubv((const GLubyte *) (pc + 0)); } void __glXDisp_Color4uiv(GLbyte * pc) { - CALL_Color4uiv(GET_DISPATCH(), ((const GLuint *) (pc + 0) - )); + glColor4uiv((const GLuint *) (pc + 0)); } void __glXDisp_Color4usv(GLbyte * pc) { - CALL_Color4usv(GET_DISPATCH(), ((const GLushort *) (pc + 0) - )); + glColor4usv((const GLushort *) (pc + 0)); } void __glXDisp_EdgeFlagv(GLbyte * pc) { - CALL_EdgeFlagv(GET_DISPATCH(), ((const GLboolean *) (pc + 0) - )); + glEdgeFlagv((const GLboolean *) (pc + 0)); } void __glXDisp_End(GLbyte * pc) { - CALL_End(GET_DISPATCH(), ()); + glEnd(); } void @@ -329,36 +293,31 @@ __glXDisp_Indexdv(GLbyte * pc) } #endif - CALL_Indexdv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glIndexdv((const GLdouble *) (pc + 0)); } void __glXDisp_Indexfv(GLbyte * pc) { - CALL_Indexfv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glIndexfv((const GLfloat *) (pc + 0)); } void __glXDisp_Indexiv(GLbyte * pc) { - CALL_Indexiv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glIndexiv((const GLint *) (pc + 0)); } void __glXDisp_Indexsv(GLbyte * pc) { - CALL_Indexsv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glIndexsv((const GLshort *) (pc + 0)); } void __glXDisp_Normal3bv(GLbyte * pc) { - CALL_Normal3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0) - )); + glNormal3bv((const GLbyte *) (pc + 0)); } void @@ -371,29 +330,25 @@ __glXDisp_Normal3dv(GLbyte * pc) } #endif - CALL_Normal3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glNormal3dv((const GLdouble *) (pc + 0)); } void __glXDisp_Normal3fv(GLbyte * pc) { - CALL_Normal3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glNormal3fv((const GLfloat *) (pc + 0)); } void __glXDisp_Normal3iv(GLbyte * pc) { - CALL_Normal3iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glNormal3iv((const GLint *) (pc + 0)); } void __glXDisp_Normal3sv(GLbyte * pc) { - CALL_Normal3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glNormal3sv((const GLshort *) (pc + 0)); } void @@ -406,29 +361,25 @@ __glXDisp_RasterPos2dv(GLbyte * pc) } #endif - CALL_RasterPos2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glRasterPos2dv((const GLdouble *) (pc + 0)); } void __glXDisp_RasterPos2fv(GLbyte * pc) { - CALL_RasterPos2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glRasterPos2fv((const GLfloat *) (pc + 0)); } void __glXDisp_RasterPos2iv(GLbyte * pc) { - CALL_RasterPos2iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glRasterPos2iv((const GLint *) (pc + 0)); } void __glXDisp_RasterPos2sv(GLbyte * pc) { - CALL_RasterPos2sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glRasterPos2sv((const GLshort *) (pc + 0)); } void @@ -441,29 +392,25 @@ __glXDisp_RasterPos3dv(GLbyte * pc) } #endif - CALL_RasterPos3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glRasterPos3dv((const GLdouble *) (pc + 0)); } void __glXDisp_RasterPos3fv(GLbyte * pc) { - CALL_RasterPos3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glRasterPos3fv((const GLfloat *) (pc + 0)); } void __glXDisp_RasterPos3iv(GLbyte * pc) { - CALL_RasterPos3iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glRasterPos3iv((const GLint *) (pc + 0)); } void __glXDisp_RasterPos3sv(GLbyte * pc) { - CALL_RasterPos3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glRasterPos3sv((const GLshort *) (pc + 0)); } void @@ -476,29 +423,25 @@ __glXDisp_RasterPos4dv(GLbyte * pc) } #endif - CALL_RasterPos4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glRasterPos4dv((const GLdouble *) (pc + 0)); } void __glXDisp_RasterPos4fv(GLbyte * pc) { - CALL_RasterPos4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glRasterPos4fv((const GLfloat *) (pc + 0)); } void __glXDisp_RasterPos4iv(GLbyte * pc) { - CALL_RasterPos4iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glRasterPos4iv((const GLint *) (pc + 0)); } void __glXDisp_RasterPos4sv(GLbyte * pc) { - CALL_RasterPos4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glRasterPos4sv((const GLshort *) (pc + 0)); } void @@ -511,33 +454,25 @@ __glXDisp_Rectdv(GLbyte * pc) } #endif - CALL_Rectdv(GET_DISPATCH(), ((const GLdouble *) (pc + 0), - (const GLdouble *) (pc + 16) - )); + glRectdv((const GLdouble *) (pc + 0), (const GLdouble *) (pc + 16)); } void __glXDisp_Rectfv(GLbyte * pc) { - CALL_Rectfv(GET_DISPATCH(), ((const GLfloat *) (pc + 0), - (const GLfloat *) (pc + 8) - )); + glRectfv((const GLfloat *) (pc + 0), (const GLfloat *) (pc + 8)); } void __glXDisp_Rectiv(GLbyte * pc) { - CALL_Rectiv(GET_DISPATCH(), ((const GLint *) (pc + 0), - (const GLint *) (pc + 8) - )); + glRectiv((const GLint *) (pc + 0), (const GLint *) (pc + 8)); } void __glXDisp_Rectsv(GLbyte * pc) { - CALL_Rectsv(GET_DISPATCH(), ((const GLshort *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glRectsv((const GLshort *) (pc + 0), (const GLshort *) (pc + 4)); } void @@ -550,29 +485,25 @@ __glXDisp_TexCoord1dv(GLbyte * pc) } #endif - CALL_TexCoord1dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glTexCoord1dv((const GLdouble *) (pc + 0)); } void __glXDisp_TexCoord1fv(GLbyte * pc) { - CALL_TexCoord1fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glTexCoord1fv((const GLfloat *) (pc + 0)); } void __glXDisp_TexCoord1iv(GLbyte * pc) { - CALL_TexCoord1iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glTexCoord1iv((const GLint *) (pc + 0)); } void __glXDisp_TexCoord1sv(GLbyte * pc) { - CALL_TexCoord1sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glTexCoord1sv((const GLshort *) (pc + 0)); } void @@ -585,29 +516,25 @@ __glXDisp_TexCoord2dv(GLbyte * pc) } #endif - CALL_TexCoord2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glTexCoord2dv((const GLdouble *) (pc + 0)); } void __glXDisp_TexCoord2fv(GLbyte * pc) { - CALL_TexCoord2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glTexCoord2fv((const GLfloat *) (pc + 0)); } void __glXDisp_TexCoord2iv(GLbyte * pc) { - CALL_TexCoord2iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glTexCoord2iv((const GLint *) (pc + 0)); } void __glXDisp_TexCoord2sv(GLbyte * pc) { - CALL_TexCoord2sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glTexCoord2sv((const GLshort *) (pc + 0)); } void @@ -620,29 +547,25 @@ __glXDisp_TexCoord3dv(GLbyte * pc) } #endif - CALL_TexCoord3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glTexCoord3dv((const GLdouble *) (pc + 0)); } void __glXDisp_TexCoord3fv(GLbyte * pc) { - CALL_TexCoord3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glTexCoord3fv((const GLfloat *) (pc + 0)); } void __glXDisp_TexCoord3iv(GLbyte * pc) { - CALL_TexCoord3iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glTexCoord3iv((const GLint *) (pc + 0)); } void __glXDisp_TexCoord3sv(GLbyte * pc) { - CALL_TexCoord3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glTexCoord3sv((const GLshort *) (pc + 0)); } void @@ -655,29 +578,25 @@ __glXDisp_TexCoord4dv(GLbyte * pc) } #endif - CALL_TexCoord4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glTexCoord4dv((const GLdouble *) (pc + 0)); } void __glXDisp_TexCoord4fv(GLbyte * pc) { - CALL_TexCoord4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glTexCoord4fv((const GLfloat *) (pc + 0)); } void __glXDisp_TexCoord4iv(GLbyte * pc) { - CALL_TexCoord4iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glTexCoord4iv((const GLint *) (pc + 0)); } void __glXDisp_TexCoord4sv(GLbyte * pc) { - CALL_TexCoord4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glTexCoord4sv((const GLshort *) (pc + 0)); } void @@ -690,29 +609,25 @@ __glXDisp_Vertex2dv(GLbyte * pc) } #endif - CALL_Vertex2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glVertex2dv((const GLdouble *) (pc + 0)); } void __glXDisp_Vertex2fv(GLbyte * pc) { - CALL_Vertex2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glVertex2fv((const GLfloat *) (pc + 0)); } void __glXDisp_Vertex2iv(GLbyte * pc) { - CALL_Vertex2iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glVertex2iv((const GLint *) (pc + 0)); } void __glXDisp_Vertex2sv(GLbyte * pc) { - CALL_Vertex2sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glVertex2sv((const GLshort *) (pc + 0)); } void @@ -725,29 +640,25 @@ __glXDisp_Vertex3dv(GLbyte * pc) } #endif - CALL_Vertex3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glVertex3dv((const GLdouble *) (pc + 0)); } void __glXDisp_Vertex3fv(GLbyte * pc) { - CALL_Vertex3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glVertex3fv((const GLfloat *) (pc + 0)); } void __glXDisp_Vertex3iv(GLbyte * pc) { - CALL_Vertex3iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glVertex3iv((const GLint *) (pc + 0)); } void __glXDisp_Vertex3sv(GLbyte * pc) { - CALL_Vertex3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glVertex3sv((const GLshort *) (pc + 0)); } void @@ -760,29 +671,25 @@ __glXDisp_Vertex4dv(GLbyte * pc) } #endif - CALL_Vertex4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glVertex4dv((const GLdouble *) (pc + 0)); } void __glXDisp_Vertex4fv(GLbyte * pc) { - CALL_Vertex4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glVertex4fv((const GLfloat *) (pc + 0)); } void __glXDisp_Vertex4iv(GLbyte * pc) { - CALL_Vertex4iv(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); + glVertex4iv((const GLint *) (pc + 0)); } void __glXDisp_Vertex4sv(GLbyte * pc) { - CALL_Vertex4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glVertex4sv((const GLshort *) (pc + 0)); } void @@ -795,31 +702,25 @@ __glXDisp_ClipPlane(GLbyte * pc) } #endif - CALL_ClipPlane(GET_DISPATCH(), (*(GLenum *) (pc + 32), - (const GLdouble *) (pc + 0) - )); + glClipPlane(*(GLenum *) (pc + 32), (const GLdouble *) (pc + 0)); } void __glXDisp_ColorMaterial(GLbyte * pc) { - CALL_ColorMaterial(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4) - )); + glColorMaterial(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)); } void __glXDisp_CullFace(GLbyte * pc) { - CALL_CullFace(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glCullFace(*(GLenum *) (pc + 0)); } void __glXDisp_Fogf(GLbyte * pc) { - CALL_Fogf(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4) - )); + glFogf(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)); } void @@ -830,14 +731,13 @@ __glXDisp_Fogfv(GLbyte * pc) params = (const GLfloat *) (pc + 4); - CALL_Fogfv(GET_DISPATCH(), (pname, params)); + glFogfv(pname, params); } void __glXDisp_Fogi(GLbyte * pc) { - CALL_Fogi(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLint *) (pc + 4) - )); + glFogi(*(GLenum *) (pc + 0), *(GLint *) (pc + 4)); } void @@ -848,29 +748,25 @@ __glXDisp_Fogiv(GLbyte * pc) params = (const GLint *) (pc + 4); - CALL_Fogiv(GET_DISPATCH(), (pname, params)); + glFogiv(pname, params); } void __glXDisp_FrontFace(GLbyte * pc) { - CALL_FrontFace(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glFrontFace(*(GLenum *) (pc + 0)); } void __glXDisp_Hint(GLbyte * pc) { - CALL_Hint(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLenum *) (pc + 4) - )); + glHint(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)); } void __glXDisp_Lightf(GLbyte * pc) { - CALL_Lightf(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8) - )); + glLightf(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)); } void @@ -881,15 +777,13 @@ __glXDisp_Lightfv(GLbyte * pc) params = (const GLfloat *) (pc + 8); - CALL_Lightfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glLightfv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_Lighti(GLbyte * pc) { - CALL_Lighti(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLint *) (pc + 8) - )); + glLighti(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4), *(GLint *) (pc + 8)); } void @@ -900,15 +794,13 @@ __glXDisp_Lightiv(GLbyte * pc) params = (const GLint *) (pc + 8); - CALL_Lightiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glLightiv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_LightModelf(GLbyte * pc) { - CALL_LightModelf(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLfloat *) (pc + 4) - )); + glLightModelf(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)); } void @@ -919,14 +811,13 @@ __glXDisp_LightModelfv(GLbyte * pc) params = (const GLfloat *) (pc + 4); - CALL_LightModelfv(GET_DISPATCH(), (pname, params)); + glLightModelfv(pname, params); } void __glXDisp_LightModeli(GLbyte * pc) { - CALL_LightModeli(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLint *) (pc + 4) - )); + glLightModeli(*(GLenum *) (pc + 0), *(GLint *) (pc + 4)); } void @@ -937,30 +828,26 @@ __glXDisp_LightModeliv(GLbyte * pc) params = (const GLint *) (pc + 4); - CALL_LightModeliv(GET_DISPATCH(), (pname, params)); + glLightModeliv(pname, params); } void __glXDisp_LineStipple(GLbyte * pc) { - CALL_LineStipple(GET_DISPATCH(), (*(GLint *) (pc + 0), - *(GLushort *) (pc + 4) - )); + glLineStipple(*(GLint *) (pc + 0), *(GLushort *) (pc + 4)); } void __glXDisp_LineWidth(GLbyte * pc) { - CALL_LineWidth(GET_DISPATCH(), (*(GLfloat *) (pc + 0) - )); + glLineWidth(*(GLfloat *) (pc + 0)); } void __glXDisp_Materialf(GLbyte * pc) { - CALL_Materialf(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8) - )); + glMaterialf(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)); } void @@ -971,15 +858,14 @@ __glXDisp_Materialfv(GLbyte * pc) params = (const GLfloat *) (pc + 8); - CALL_Materialfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glMaterialfv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_Materiali(GLbyte * pc) { - CALL_Materiali(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLint *) (pc + 8) - )); + glMateriali(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLint *) (pc + 8)); } void @@ -990,21 +876,19 @@ __glXDisp_Materialiv(GLbyte * pc) params = (const GLint *) (pc + 8); - CALL_Materialiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glMaterialiv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_PointSize(GLbyte * pc) { - CALL_PointSize(GET_DISPATCH(), (*(GLfloat *) (pc + 0) - )); + glPointSize(*(GLfloat *) (pc + 0)); } void __glXDisp_PolygonMode(GLbyte * pc) { - CALL_PolygonMode(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLenum *) (pc + 4) - )); + glPolygonMode(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)); } void @@ -1013,42 +897,34 @@ __glXDisp_PolygonStipple(GLbyte * pc) const GLubyte *const mask = (const GLubyte *) ((pc + 20)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_PolygonStipple(GET_DISPATCH(), (mask)); + glPolygonStipple(mask); } void __glXDisp_Scissor(GLbyte * pc) { - CALL_Scissor(GET_DISPATCH(), (*(GLint *) (pc + 0), - *(GLint *) (pc + 4), - *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12) - )); + glScissor(*(GLint *) (pc + 0), + *(GLint *) (pc + 4), + *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12)); } void __glXDisp_ShadeModel(GLbyte * pc) { - CALL_ShadeModel(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glShadeModel(*(GLenum *) (pc + 0)); } void __glXDisp_TexParameterf(GLbyte * pc) { - CALL_TexParameterf(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLfloat *) (pc + 8) - )); + glTexParameterf(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)); } void @@ -1059,16 +935,14 @@ __glXDisp_TexParameterfv(GLbyte * pc) params = (const GLfloat *) (pc + 8); - CALL_TexParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glTexParameterfv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_TexParameteri(GLbyte * pc) { - CALL_TexParameteri(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLint *) (pc + 8) - )); + glTexParameteri(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLint *) (pc + 8)); } void @@ -1079,7 +953,7 @@ __glXDisp_TexParameteriv(GLbyte * pc) params = (const GLint *) (pc + 8); - CALL_TexParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glTexParameteriv(*(GLenum *) (pc + 0), pname, params); } void @@ -1088,24 +962,19 @@ __glXDisp_TexImage1D(GLbyte * pc) const GLvoid *const pixels = (const GLvoid *) ((pc + 52)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_TexImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 20), - *(GLint *) (pc + 24), - *(GLint *) (pc + 28), - *(GLsizei *) (pc + 32), - *(GLint *) (pc + 40), - *(GLenum *) (pc + 44), - *(GLenum *) (pc + 48), pixels)); + glTexImage1D(*(GLenum *) (pc + 20), + *(GLint *) (pc + 24), + *(GLint *) (pc + 28), + *(GLsizei *) (pc + 32), + *(GLint *) (pc + 40), + *(GLenum *) (pc + 44), *(GLenum *) (pc + 48), pixels); } void @@ -1114,33 +983,27 @@ __glXDisp_TexImage2D(GLbyte * pc) const GLvoid *const pixels = (const GLvoid *) ((pc + 52)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_TexImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 20), - *(GLint *) (pc + 24), - *(GLint *) (pc + 28), - *(GLsizei *) (pc + 32), - *(GLsizei *) (pc + 36), - *(GLint *) (pc + 40), - *(GLenum *) (pc + 44), - *(GLenum *) (pc + 48), pixels)); + glTexImage2D(*(GLenum *) (pc + 20), + *(GLint *) (pc + 24), + *(GLint *) (pc + 28), + *(GLsizei *) (pc + 32), + *(GLsizei *) (pc + 36), + *(GLint *) (pc + 40), + *(GLenum *) (pc + 44), *(GLenum *) (pc + 48), pixels); } void __glXDisp_TexEnvf(GLbyte * pc) { - CALL_TexEnvf(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8) - )); + glTexEnvf(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)); } void @@ -1151,15 +1014,13 @@ __glXDisp_TexEnvfv(GLbyte * pc) params = (const GLfloat *) (pc + 8); - CALL_TexEnvfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glTexEnvfv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_TexEnvi(GLbyte * pc) { - CALL_TexEnvi(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLint *) (pc + 8) - )); + glTexEnvi(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4), *(GLint *) (pc + 8)); } void @@ -1170,7 +1031,7 @@ __glXDisp_TexEnviv(GLbyte * pc) params = (const GLint *) (pc + 8); - CALL_TexEnviv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glTexEnviv(*(GLenum *) (pc + 0), pname, params); } void @@ -1183,9 +1044,8 @@ __glXDisp_TexGend(GLbyte * pc) } #endif - CALL_TexGend(GET_DISPATCH(), (*(GLenum *) (pc + 8), - *(GLenum *) (pc + 12), *(GLdouble *) (pc + 0) - )); + glTexGend(*(GLenum *) (pc + 8), + *(GLenum *) (pc + 12), *(GLdouble *) (pc + 0)); } void @@ -1206,15 +1066,14 @@ __glXDisp_TexGendv(GLbyte * pc) params = (const GLdouble *) (pc + 8); - CALL_TexGendv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glTexGendv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_TexGenf(GLbyte * pc) { - CALL_TexGenf(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8) - )); + glTexGenf(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)); } void @@ -1225,15 +1084,13 @@ __glXDisp_TexGenfv(GLbyte * pc) params = (const GLfloat *) (pc + 8); - CALL_TexGenfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glTexGenfv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_TexGeni(GLbyte * pc) { - CALL_TexGeni(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLint *) (pc + 8) - )); + glTexGeni(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4), *(GLint *) (pc + 8)); } void @@ -1244,88 +1101,77 @@ __glXDisp_TexGeniv(GLbyte * pc) params = (const GLint *) (pc + 8); - CALL_TexGeniv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glTexGeniv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_InitNames(GLbyte * pc) { - CALL_InitNames(GET_DISPATCH(), ()); + glInitNames(); } void __glXDisp_LoadName(GLbyte * pc) { - CALL_LoadName(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + glLoadName(*(GLuint *) (pc + 0)); } void __glXDisp_PassThrough(GLbyte * pc) { - CALL_PassThrough(GET_DISPATCH(), (*(GLfloat *) (pc + 0) - )); + glPassThrough(*(GLfloat *) (pc + 0)); } void __glXDisp_PopName(GLbyte * pc) { - CALL_PopName(GET_DISPATCH(), ()); + glPopName(); } void __glXDisp_PushName(GLbyte * pc) { - CALL_PushName(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + glPushName(*(GLuint *) (pc + 0)); } void __glXDisp_DrawBuffer(GLbyte * pc) { - CALL_DrawBuffer(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glDrawBuffer(*(GLenum *) (pc + 0)); } void __glXDisp_Clear(GLbyte * pc) { - CALL_Clear(GET_DISPATCH(), (*(GLbitfield *) (pc + 0) - )); + glClear(*(GLbitfield *) (pc + 0)); } void __glXDisp_ClearAccum(GLbyte * pc) { - CALL_ClearAccum(GET_DISPATCH(), (*(GLfloat *) (pc + 0), - *(GLfloat *) (pc + 4), - *(GLfloat *) (pc + 8), - *(GLfloat *) (pc + 12) - )); + glClearAccum(*(GLfloat *) (pc + 0), + *(GLfloat *) (pc + 4), + *(GLfloat *) (pc + 8), *(GLfloat *) (pc + 12)); } void __glXDisp_ClearIndex(GLbyte * pc) { - CALL_ClearIndex(GET_DISPATCH(), (*(GLfloat *) (pc + 0) - )); + glClearIndex(*(GLfloat *) (pc + 0)); } void __glXDisp_ClearColor(GLbyte * pc) { - CALL_ClearColor(GET_DISPATCH(), (*(GLclampf *) (pc + 0), - *(GLclampf *) (pc + 4), - *(GLclampf *) (pc + 8), - *(GLclampf *) (pc + 12) - )); + glClearColor(*(GLclampf *) (pc + 0), + *(GLclampf *) (pc + 4), + *(GLclampf *) (pc + 8), *(GLclampf *) (pc + 12)); } void __glXDisp_ClearStencil(GLbyte * pc) { - CALL_ClearStencil(GET_DISPATCH(), (*(GLint *) (pc + 0) - )); + glClearStencil(*(GLint *) (pc + 0)); } void @@ -1338,73 +1184,63 @@ __glXDisp_ClearDepth(GLbyte * pc) } #endif - CALL_ClearDepth(GET_DISPATCH(), (*(GLclampd *) (pc + 0) - )); + glClearDepth(*(GLclampd *) (pc + 0)); } void __glXDisp_StencilMask(GLbyte * pc) { - CALL_StencilMask(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + glStencilMask(*(GLuint *) (pc + 0)); } void __glXDisp_ColorMask(GLbyte * pc) { - CALL_ColorMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0), - *(GLboolean *) (pc + 1), - *(GLboolean *) (pc + 2), - *(GLboolean *) (pc + 3) - )); + glColorMask(*(GLboolean *) (pc + 0), + *(GLboolean *) (pc + 1), + *(GLboolean *) (pc + 2), *(GLboolean *) (pc + 3)); } void __glXDisp_DepthMask(GLbyte * pc) { - CALL_DepthMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0) - )); + glDepthMask(*(GLboolean *) (pc + 0)); } void __glXDisp_IndexMask(GLbyte * pc) { - CALL_IndexMask(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + glIndexMask(*(GLuint *) (pc + 0)); } void __glXDisp_Accum(GLbyte * pc) { - CALL_Accum(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4) - )); + glAccum(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)); } void __glXDisp_Disable(GLbyte * pc) { - CALL_Disable(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glDisable(*(GLenum *) (pc + 0)); } void __glXDisp_Enable(GLbyte * pc) { - CALL_Enable(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glEnable(*(GLenum *) (pc + 0)); } void __glXDisp_PopAttrib(GLbyte * pc) { - CALL_PopAttrib(GET_DISPATCH(), ()); + glPopAttrib(); } void __glXDisp_PushAttrib(GLbyte * pc) { - CALL_PushAttrib(GET_DISPATCH(), (*(GLbitfield *) (pc + 0) - )); + glPushAttrib(*(GLbitfield *) (pc + 0)); } void @@ -1417,18 +1253,15 @@ __glXDisp_MapGrid1d(GLbyte * pc) } #endif - CALL_MapGrid1d(GET_DISPATCH(), (*(GLint *) (pc + 16), - *(GLdouble *) (pc + 0), - *(GLdouble *) (pc + 8) - )); + glMapGrid1d(*(GLint *) (pc + 16), + *(GLdouble *) (pc + 0), *(GLdouble *) (pc + 8)); } void __glXDisp_MapGrid1f(GLbyte * pc) { - CALL_MapGrid1f(GET_DISPATCH(), (*(GLint *) (pc + 0), - *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8) - )); + glMapGrid1f(*(GLint *) (pc + 0), + *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8)); } void @@ -1441,25 +1274,21 @@ __glXDisp_MapGrid2d(GLbyte * pc) } #endif - CALL_MapGrid2d(GET_DISPATCH(), (*(GLint *) (pc + 32), - *(GLdouble *) (pc + 0), - *(GLdouble *) (pc + 8), - *(GLint *) (pc + 36), - *(GLdouble *) (pc + 16), - *(GLdouble *) (pc + 24) - )); + glMapGrid2d(*(GLint *) (pc + 32), + *(GLdouble *) (pc + 0), + *(GLdouble *) (pc + 8), + *(GLint *) (pc + 36), + *(GLdouble *) (pc + 16), *(GLdouble *) (pc + 24)); } void __glXDisp_MapGrid2f(GLbyte * pc) { - CALL_MapGrid2f(GET_DISPATCH(), (*(GLint *) (pc + 0), - *(GLfloat *) (pc + 4), - *(GLfloat *) (pc + 8), - *(GLint *) (pc + 12), - *(GLfloat *) (pc + 16), - *(GLfloat *) (pc + 20) - )); + glMapGrid2f(*(GLint *) (pc + 0), + *(GLfloat *) (pc + 4), + *(GLfloat *) (pc + 8), + *(GLint *) (pc + 12), + *(GLfloat *) (pc + 16), *(GLfloat *) (pc + 20)); } void @@ -1472,15 +1301,13 @@ __glXDisp_EvalCoord1dv(GLbyte * pc) } #endif - CALL_EvalCoord1dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glEvalCoord1dv((const GLdouble *) (pc + 0)); } void __glXDisp_EvalCoord1fv(GLbyte * pc) { - CALL_EvalCoord1fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glEvalCoord1fv((const GLfloat *) (pc + 0)); } void @@ -1493,114 +1320,96 @@ __glXDisp_EvalCoord2dv(GLbyte * pc) } #endif - CALL_EvalCoord2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glEvalCoord2dv((const GLdouble *) (pc + 0)); } void __glXDisp_EvalCoord2fv(GLbyte * pc) { - CALL_EvalCoord2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glEvalCoord2fv((const GLfloat *) (pc + 0)); } void __glXDisp_EvalMesh1(GLbyte * pc) { - CALL_EvalMesh1(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), *(GLint *) (pc + 8) - )); + glEvalMesh1(*(GLenum *) (pc + 0), *(GLint *) (pc + 4), *(GLint *) (pc + 8)); } void __glXDisp_EvalPoint1(GLbyte * pc) { - CALL_EvalPoint1(GET_DISPATCH(), (*(GLint *) (pc + 0) - )); + glEvalPoint1(*(GLint *) (pc + 0)); } void __glXDisp_EvalMesh2(GLbyte * pc) { - CALL_EvalMesh2(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), *(GLint *) (pc + 16) - )); + glEvalMesh2(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), *(GLint *) (pc + 16)); } void __glXDisp_EvalPoint2(GLbyte * pc) { - CALL_EvalPoint2(GET_DISPATCH(), (*(GLint *) (pc + 0), *(GLint *) (pc + 4) - )); + glEvalPoint2(*(GLint *) (pc + 0), *(GLint *) (pc + 4)); } void __glXDisp_AlphaFunc(GLbyte * pc) { - CALL_AlphaFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLclampf *) (pc + 4) - )); + glAlphaFunc(*(GLenum *) (pc + 0), *(GLclampf *) (pc + 4)); } void __glXDisp_BlendFunc(GLbyte * pc) { - CALL_BlendFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLenum *) (pc + 4) - )); + glBlendFunc(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)); } void __glXDisp_LogicOp(GLbyte * pc) { - CALL_LogicOp(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glLogicOp(*(GLenum *) (pc + 0)); } void __glXDisp_StencilFunc(GLbyte * pc) { - CALL_StencilFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), *(GLuint *) (pc + 8) - )); + glStencilFunc(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), *(GLuint *) (pc + 8)); } void __glXDisp_StencilOp(GLbyte * pc) { - CALL_StencilOp(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLenum *) (pc + 8) - )); + glStencilOp(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLenum *) (pc + 8)); } void __glXDisp_DepthFunc(GLbyte * pc) { - CALL_DepthFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glDepthFunc(*(GLenum *) (pc + 0)); } void __glXDisp_PixelZoom(GLbyte * pc) { - CALL_PixelZoom(GET_DISPATCH(), (*(GLfloat *) (pc + 0), *(GLfloat *) (pc + 4) - )); + glPixelZoom(*(GLfloat *) (pc + 0), *(GLfloat *) (pc + 4)); } void __glXDisp_PixelTransferf(GLbyte * pc) { - CALL_PixelTransferf(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLfloat *) (pc + 4) - )); + glPixelTransferf(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)); } void __glXDisp_PixelTransferi(GLbyte * pc) { - CALL_PixelTransferi(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4) - )); + glPixelTransferi(*(GLenum *) (pc + 0), *(GLint *) (pc + 4)); } int @@ -1612,9 +1421,7 @@ __glXDisp_PixelStoref(__GLXclientState * cl, GLbyte * pc) pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { - CALL_PixelStoref(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLfloat *) (pc + 4) - )); + glPixelStoref(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)); error = Success; } @@ -1630,9 +1437,7 @@ __glXDisp_PixelStorei(__GLXclientState * cl, GLbyte * pc) pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { - CALL_PixelStorei(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4) - )); + glPixelStorei(*(GLenum *) (pc + 0), *(GLint *) (pc + 4)); error = Success; } @@ -1644,9 +1449,7 @@ __glXDisp_PixelMapfv(GLbyte * pc) { const GLsizei mapsize = *(GLsizei *) (pc + 4); - CALL_PixelMapfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - mapsize, (const GLfloat *) (pc + 8) - )); + glPixelMapfv(*(GLenum *) (pc + 0), mapsize, (const GLfloat *) (pc + 8)); } void @@ -1654,9 +1457,7 @@ __glXDisp_PixelMapuiv(GLbyte * pc) { const GLsizei mapsize = *(GLsizei *) (pc + 4); - CALL_PixelMapuiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - mapsize, (const GLuint *) (pc + 8) - )); + glPixelMapuiv(*(GLenum *) (pc + 0), mapsize, (const GLuint *) (pc + 8)); } void @@ -1664,27 +1465,22 @@ __glXDisp_PixelMapusv(GLbyte * pc) { const GLsizei mapsize = *(GLsizei *) (pc + 4); - CALL_PixelMapusv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - mapsize, (const GLushort *) (pc + 8) - )); + glPixelMapusv(*(GLenum *) (pc + 0), mapsize, (const GLushort *) (pc + 8)); } void __glXDisp_ReadBuffer(GLbyte * pc) { - CALL_ReadBuffer(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glReadBuffer(*(GLenum *) (pc + 0)); } void __glXDisp_CopyPixels(GLbyte * pc) { - CALL_CopyPixels(GET_DISPATCH(), (*(GLint *) (pc + 0), - *(GLint *) (pc + 4), - *(GLsizei *) (pc + 8), - *(GLsizei *) (pc + 12), - *(GLenum *) (pc + 16) - )); + glCopyPixels(*(GLint *) (pc + 0), + *(GLint *) (pc + 4), + *(GLsizei *) (pc + 8), + *(GLsizei *) (pc + 12), *(GLenum *) (pc + 16)); } void @@ -1693,21 +1489,16 @@ __glXDisp_DrawPixels(GLbyte * pc) const GLvoid *const pixels = (const GLvoid *) ((pc + 36)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_DrawPixels(GET_DISPATCH(), (*(GLsizei *) (pc + 20), - *(GLsizei *) (pc + 24), - *(GLenum *) (pc + 28), - *(GLenum *) (pc + 32), pixels)); + glDrawPixels(*(GLsizei *) (pc + 20), + *(GLsizei *) (pc + 24), + *(GLenum *) (pc + 28), *(GLenum *) (pc + 32), pixels); } int @@ -1731,7 +1522,7 @@ __glXDisp_GetBooleanv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetBooleanv(GET_DISPATCH(), (pname, params)); + glGetBooleanv(pname, params); __glXSendReply(cl->client, params, compsize, 1, GL_FALSE, 0); error = Success; } @@ -1750,7 +1541,7 @@ __glXDisp_GetClipPlane(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { GLdouble equation[4]; - CALL_GetClipPlane(GET_DISPATCH(), (*(GLenum *) (pc + 0), equation)); + glGetClipPlane(*(GLenum *) (pc + 0), equation); __glXSendReply(cl->client, equation, 4, 8, GL_TRUE, 0); error = Success; } @@ -1779,7 +1570,7 @@ __glXDisp_GetDoublev(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetDoublev(GET_DISPATCH(), (pname, params)); + glGetDoublev(pname, params); __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0); error = Success; } @@ -1798,7 +1589,7 @@ __glXDisp_GetError(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { GLenum retval; - retval = CALL_GetError(GET_DISPATCH(), ()); + retval = glGetError(); __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -1827,7 +1618,7 @@ __glXDisp_GetFloatv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetFloatv(GET_DISPATCH(), (pname, params)); + glGetFloatv(pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -1856,7 +1647,7 @@ __glXDisp_GetIntegerv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetIntegerv(GET_DISPATCH(), (pname, params)); + glGetIntegerv(pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -1885,7 +1676,7 @@ __glXDisp_GetLightfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetLightfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glGetLightfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -1914,7 +1705,7 @@ __glXDisp_GetLightiv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetLightiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glGetLightiv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -1944,7 +1735,7 @@ __glXDisp_GetMapdv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetMapdv(GET_DISPATCH(), (target, query, v)); + glGetMapdv(target, query, v); __glXSendReply(cl->client, v, compsize, 8, GL_FALSE, 0); error = Success; } @@ -1974,7 +1765,7 @@ __glXDisp_GetMapfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetMapfv(GET_DISPATCH(), (target, query, v)); + glGetMapfv(target, query, v); __glXSendReply(cl->client, v, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2004,7 +1795,7 @@ __glXDisp_GetMapiv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetMapiv(GET_DISPATCH(), (target, query, v)); + glGetMapiv(target, query, v); __glXSendReply(cl->client, v, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2033,8 +1824,7 @@ __glXDisp_GetMaterialfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetMaterialfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetMaterialfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2063,8 +1853,7 @@ __glXDisp_GetMaterialiv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetMaterialiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetMaterialiv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2093,7 +1882,7 @@ __glXDisp_GetPixelMapfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetPixelMapfv(GET_DISPATCH(), (map, values)); + glGetPixelMapfv(map, values); __glXSendReply(cl->client, values, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2122,7 +1911,7 @@ __glXDisp_GetPixelMapuiv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetPixelMapuiv(GET_DISPATCH(), (map, values)); + glGetPixelMapuiv(map, values); __glXSendReply(cl->client, values, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2151,7 +1940,7 @@ __glXDisp_GetPixelMapusv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetPixelMapusv(GET_DISPATCH(), (map, values)); + glGetPixelMapusv(map, values); __glXSendReply(cl->client, values, compsize, 2, GL_FALSE, 0); error = Success; } @@ -2180,7 +1969,7 @@ __glXDisp_GetTexEnvfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetTexEnvfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glGetTexEnvfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2209,7 +1998,7 @@ __glXDisp_GetTexEnviv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetTexEnviv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glGetTexEnviv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2238,7 +2027,7 @@ __glXDisp_GetTexGendv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetTexGendv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glGetTexGendv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0); error = Success; } @@ -2267,7 +2056,7 @@ __glXDisp_GetTexGenfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetTexGenfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glGetTexGenfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2296,7 +2085,7 @@ __glXDisp_GetTexGeniv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetTexGeniv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params)); + glGetTexGeniv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2325,8 +2114,7 @@ __glXDisp_GetTexParameterfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetTexParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetTexParameterfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2355,8 +2143,7 @@ __glXDisp_GetTexParameteriv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetTexParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetTexParameteriv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2385,9 +2172,8 @@ __glXDisp_GetTexLevelParameterfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetTexLevelParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - pname, params)); + glGetTexLevelParameterfv(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2416,9 +2202,8 @@ __glXDisp_GetTexLevelParameteriv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetTexLevelParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - pname, params)); + glGetTexLevelParameteriv(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -2437,8 +2222,7 @@ __glXDisp_IsEnabled(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { GLboolean retval; - retval = CALL_IsEnabled(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + retval = glIsEnabled(*(GLenum *) (pc + 0)); __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -2457,8 +2241,7 @@ __glXDisp_IsList(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { GLboolean retval; - retval = CALL_IsList(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + retval = glIsList(*(GLuint *) (pc + 0)); __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -2476,9 +2259,7 @@ __glXDisp_DepthRange(GLbyte * pc) } #endif - CALL_DepthRange(GET_DISPATCH(), (*(GLclampd *) (pc + 0), - *(GLclampd *) (pc + 8) - )); + glDepthRange(*(GLclampd *) (pc + 0), *(GLclampd *) (pc + 8)); } void @@ -2491,26 +2272,23 @@ __glXDisp_Frustum(GLbyte * pc) } #endif - CALL_Frustum(GET_DISPATCH(), (*(GLdouble *) (pc + 0), - *(GLdouble *) (pc + 8), - *(GLdouble *) (pc + 16), - *(GLdouble *) (pc + 24), - *(GLdouble *) (pc + 32), - *(GLdouble *) (pc + 40) - )); + glFrustum(*(GLdouble *) (pc + 0), + *(GLdouble *) (pc + 8), + *(GLdouble *) (pc + 16), + *(GLdouble *) (pc + 24), + *(GLdouble *) (pc + 32), *(GLdouble *) (pc + 40)); } void __glXDisp_LoadIdentity(GLbyte * pc) { - CALL_LoadIdentity(GET_DISPATCH(), ()); + glLoadIdentity(); } void __glXDisp_LoadMatrixf(GLbyte * pc) { - CALL_LoadMatrixf(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glLoadMatrixf((const GLfloat *) (pc + 0)); } void @@ -2523,22 +2301,19 @@ __glXDisp_LoadMatrixd(GLbyte * pc) } #endif - CALL_LoadMatrixd(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glLoadMatrixd((const GLdouble *) (pc + 0)); } void __glXDisp_MatrixMode(GLbyte * pc) { - CALL_MatrixMode(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glMatrixMode(*(GLenum *) (pc + 0)); } void __glXDisp_MultMatrixf(GLbyte * pc) { - CALL_MultMatrixf(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glMultMatrixf((const GLfloat *) (pc + 0)); } void @@ -2551,8 +2326,7 @@ __glXDisp_MultMatrixd(GLbyte * pc) } #endif - CALL_MultMatrixd(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glMultMatrixd((const GLdouble *) (pc + 0)); } void @@ -2565,24 +2339,23 @@ __glXDisp_Ortho(GLbyte * pc) } #endif - CALL_Ortho(GET_DISPATCH(), (*(GLdouble *) (pc + 0), - *(GLdouble *) (pc + 8), - *(GLdouble *) (pc + 16), - *(GLdouble *) (pc + 24), - *(GLdouble *) (pc + 32), *(GLdouble *) (pc + 40) - )); + glOrtho(*(GLdouble *) (pc + 0), + *(GLdouble *) (pc + 8), + *(GLdouble *) (pc + 16), + *(GLdouble *) (pc + 24), + *(GLdouble *) (pc + 32), *(GLdouble *) (pc + 40)); } void __glXDisp_PopMatrix(GLbyte * pc) { - CALL_PopMatrix(GET_DISPATCH(), ()); + glPopMatrix(); } void __glXDisp_PushMatrix(GLbyte * pc) { - CALL_PushMatrix(GET_DISPATCH(), ()); + glPushMatrix(); } void @@ -2595,20 +2368,17 @@ __glXDisp_Rotated(GLbyte * pc) } #endif - CALL_Rotated(GET_DISPATCH(), (*(GLdouble *) (pc + 0), - *(GLdouble *) (pc + 8), - *(GLdouble *) (pc + 16), - *(GLdouble *) (pc + 24) - )); + glRotated(*(GLdouble *) (pc + 0), + *(GLdouble *) (pc + 8), + *(GLdouble *) (pc + 16), *(GLdouble *) (pc + 24)); } void __glXDisp_Rotatef(GLbyte * pc) { - CALL_Rotatef(GET_DISPATCH(), (*(GLfloat *) (pc + 0), - *(GLfloat *) (pc + 4), - *(GLfloat *) (pc + 8), *(GLfloat *) (pc + 12) - )); + glRotatef(*(GLfloat *) (pc + 0), + *(GLfloat *) (pc + 4), + *(GLfloat *) (pc + 8), *(GLfloat *) (pc + 12)); } void @@ -2621,17 +2391,15 @@ __glXDisp_Scaled(GLbyte * pc) } #endif - CALL_Scaled(GET_DISPATCH(), (*(GLdouble *) (pc + 0), - *(GLdouble *) (pc + 8), *(GLdouble *) (pc + 16) - )); + glScaled(*(GLdouble *) (pc + 0), + *(GLdouble *) (pc + 8), *(GLdouble *) (pc + 16)); } void __glXDisp_Scalef(GLbyte * pc) { - CALL_Scalef(GET_DISPATCH(), (*(GLfloat *) (pc + 0), - *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8) - )); + glScalef(*(GLfloat *) (pc + 0), + *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8)); } void @@ -2644,50 +2412,41 @@ __glXDisp_Translated(GLbyte * pc) } #endif - CALL_Translated(GET_DISPATCH(), (*(GLdouble *) (pc + 0), - *(GLdouble *) (pc + 8), - *(GLdouble *) (pc + 16) - )); + glTranslated(*(GLdouble *) (pc + 0), + *(GLdouble *) (pc + 8), *(GLdouble *) (pc + 16)); } void __glXDisp_Translatef(GLbyte * pc) { - CALL_Translatef(GET_DISPATCH(), (*(GLfloat *) (pc + 0), - *(GLfloat *) (pc + 4), - *(GLfloat *) (pc + 8) - )); + glTranslatef(*(GLfloat *) (pc + 0), + *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8)); } void __glXDisp_Viewport(GLbyte * pc) { - CALL_Viewport(GET_DISPATCH(), (*(GLint *) (pc + 0), - *(GLint *) (pc + 4), - *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12) - )); + glViewport(*(GLint *) (pc + 0), + *(GLint *) (pc + 4), + *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12)); } void __glXDisp_BindTexture(GLbyte * pc) { - CALL_BindTexture(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLuint *) (pc + 4) - )); + glBindTexture(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4)); } void __glXDisp_Indexubv(GLbyte * pc) { - CALL_Indexubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0) - )); + glIndexubv((const GLubyte *) (pc + 0)); } void __glXDisp_PolygonOffset(GLbyte * pc) { - CALL_PolygonOffset(GET_DISPATCH(), (*(GLfloat *) (pc + 0), - *(GLfloat *) (pc + 4) - )); + glPolygonOffset(*(GLfloat *) (pc + 0), *(GLfloat *) (pc + 4)); } int @@ -2706,9 +2465,7 @@ __glXDisp_AreTexturesResident(__GLXclientState * cl, GLbyte * pc) GLboolean *residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1); retval = - CALL_AreTexturesResident(GET_DISPATCH(), - (n, (const GLuint *) (pc + 4), - residences)); + glAreTexturesResident(n, (const GLuint *) (pc + 4), residences); __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval); error = Success; } @@ -2732,9 +2489,7 @@ __glXDisp_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc) GLboolean *residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1); retval = - CALL_AreTexturesResident(GET_DISPATCH(), - (n, (const GLuint *) (pc + 4), - residences)); + glAreTexturesResident(n, (const GLuint *) (pc + 4), residences); __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval); error = Success; } @@ -2745,54 +2500,46 @@ __glXDisp_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc) void __glXDisp_CopyTexImage1D(GLbyte * pc) { - CALL_CopyTexImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLint *) (pc + 12), - *(GLint *) (pc + 16), - *(GLsizei *) (pc + 20), - *(GLint *) (pc + 24) - )); + glCopyTexImage1D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLenum *) (pc + 8), + *(GLint *) (pc + 12), + *(GLint *) (pc + 16), + *(GLsizei *) (pc + 20), *(GLint *) (pc + 24)); } void __glXDisp_CopyTexImage2D(GLbyte * pc) { - CALL_CopyTexImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLint *) (pc + 12), - *(GLint *) (pc + 16), - *(GLsizei *) (pc + 20), - *(GLsizei *) (pc + 24), - *(GLint *) (pc + 28) - )); + glCopyTexImage2D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLenum *) (pc + 8), + *(GLint *) (pc + 12), + *(GLint *) (pc + 16), + *(GLsizei *) (pc + 20), + *(GLsizei *) (pc + 24), *(GLint *) (pc + 28)); } void __glXDisp_CopyTexSubImage1D(GLbyte * pc) { - CALL_CopyTexSubImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLint *) (pc + 16), - *(GLsizei *) (pc + 20) - )); + glCopyTexSubImage1D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), + *(GLint *) (pc + 16), *(GLsizei *) (pc + 20)); } void __glXDisp_CopyTexSubImage2D(GLbyte * pc) { - CALL_CopyTexSubImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLint *) (pc + 16), - *(GLint *) (pc + 20), - *(GLsizei *) (pc + 24), - *(GLsizei *) (pc + 28) - )); + glCopyTexSubImage2D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), + *(GLint *) (pc + 16), + *(GLint *) (pc + 20), + *(GLsizei *) (pc + 24), *(GLsizei *) (pc + 28)); } int @@ -2806,8 +2553,7 @@ __glXDisp_DeleteTextures(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { const GLsizei n = *(GLsizei *) (pc + 0); - CALL_DeleteTextures(GET_DISPATCH(), (n, (const GLuint *) (pc + 4) - )); + glDeleteTextures(n, (const GLuint *) (pc + 4)); error = Success; } @@ -2825,8 +2571,7 @@ __glXDisp_DeleteTexturesEXT(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { const GLsizei n = *(GLsizei *) (pc + 0); - CALL_DeleteTextures(GET_DISPATCH(), (n, (const GLuint *) (pc + 4) - )); + glDeleteTextures(n, (const GLuint *) (pc + 4)); error = Success; } @@ -2848,7 +2593,7 @@ __glXDisp_GenTextures(__GLXclientState * cl, GLbyte * pc) GLuint *textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4); - CALL_GenTextures(GET_DISPATCH(), (n, textures)); + glGenTextures(n, textures); __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0); error = Success; } @@ -2871,7 +2616,7 @@ __glXDisp_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc) GLuint *textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4); - CALL_GenTextures(GET_DISPATCH(), (n, textures)); + glGenTextures(n, textures); __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0); error = Success; } @@ -2890,8 +2635,7 @@ __glXDisp_IsTexture(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { GLboolean retval; - retval = CALL_IsTexture(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + retval = glIsTexture(*(GLuint *) (pc + 0)); __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -2910,8 +2654,7 @@ __glXDisp_IsTextureEXT(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { GLboolean retval; - retval = CALL_IsTexture(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + retval = glIsTexture(*(GLuint *) (pc + 0)); __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -2924,10 +2667,9 @@ __glXDisp_PrioritizeTextures(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 0); - CALL_PrioritizeTextures(GET_DISPATCH(), (n, - (const GLuint *) (pc + 4), - (const GLclampf *) (pc + 4) - )); + glPrioritizeTextures(n, + (const GLuint *) (pc + 4), + (const GLclampf *) (pc + 4)); } void @@ -2936,23 +2678,18 @@ __glXDisp_TexSubImage1D(GLbyte * pc) const GLvoid *const pixels = (const GLvoid *) ((pc + 56)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_TexSubImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 20), - *(GLint *) (pc + 24), - *(GLint *) (pc + 28), - *(GLsizei *) (pc + 36), - *(GLenum *) (pc + 44), - *(GLenum *) (pc + 48), pixels)); + glTexSubImage1D(*(GLenum *) (pc + 20), + *(GLint *) (pc + 24), + *(GLint *) (pc + 28), + *(GLsizei *) (pc + 36), + *(GLenum *) (pc + 44), *(GLenum *) (pc + 48), pixels); } void @@ -2961,42 +2698,34 @@ __glXDisp_TexSubImage2D(GLbyte * pc) const GLvoid *const pixels = (const GLvoid *) ((pc + 56)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_TexSubImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 20), - *(GLint *) (pc + 24), - *(GLint *) (pc + 28), - *(GLint *) (pc + 32), - *(GLsizei *) (pc + 36), - *(GLsizei *) (pc + 40), - *(GLenum *) (pc + 44), - *(GLenum *) (pc + 48), pixels)); + glTexSubImage2D(*(GLenum *) (pc + 20), + *(GLint *) (pc + 24), + *(GLint *) (pc + 28), + *(GLint *) (pc + 32), + *(GLsizei *) (pc + 36), + *(GLsizei *) (pc + 40), + *(GLenum *) (pc + 44), *(GLenum *) (pc + 48), pixels); } void __glXDisp_BlendColor(GLbyte * pc) { - CALL_BlendColor(GET_DISPATCH(), (*(GLclampf *) (pc + 0), - *(GLclampf *) (pc + 4), - *(GLclampf *) (pc + 8), - *(GLclampf *) (pc + 12) - )); + glBlendColor(*(GLclampf *) (pc + 0), + *(GLclampf *) (pc + 4), + *(GLclampf *) (pc + 8), *(GLclampf *) (pc + 12)); } void __glXDisp_BlendEquation(GLbyte * pc) { - CALL_BlendEquation(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glBlendEquation(*(GLenum *) (pc + 0)); } void @@ -3005,22 +2734,17 @@ __glXDisp_ColorTable(GLbyte * pc) const GLvoid *const table = (const GLvoid *) ((pc + 40)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_ColorTable(GET_DISPATCH(), (*(GLenum *) (pc + 20), - *(GLenum *) (pc + 24), - *(GLsizei *) (pc + 28), - *(GLenum *) (pc + 32), - *(GLenum *) (pc + 36), table)); + glColorTable(*(GLenum *) (pc + 20), + *(GLenum *) (pc + 24), + *(GLsizei *) (pc + 28), + *(GLenum *) (pc + 32), *(GLenum *) (pc + 36), table); } void @@ -3031,8 +2755,7 @@ __glXDisp_ColorTableParameterfv(GLbyte * pc) params = (const GLfloat *) (pc + 8); - CALL_ColorTableParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glColorTableParameterfv(*(GLenum *) (pc + 0), pname, params); } void @@ -3043,19 +2766,16 @@ __glXDisp_ColorTableParameteriv(GLbyte * pc) params = (const GLint *) (pc + 8); - CALL_ColorTableParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glColorTableParameteriv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_CopyColorTable(GLbyte * pc) { - CALL_CopyColorTable(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLsizei *) (pc + 16) - )); + glCopyColorTable(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), *(GLsizei *) (pc + 16)); } int @@ -3079,8 +2799,7 @@ __glXDisp_GetColorTableParameterfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetColorTableParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetColorTableParameterfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3109,8 +2828,7 @@ __glXDisp_GetColorTableParameterfvSGI(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetColorTableParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetColorTableParameterfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3139,8 +2857,7 @@ __glXDisp_GetColorTableParameteriv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetColorTableParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetColorTableParameteriv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3169,8 +2886,7 @@ __glXDisp_GetColorTableParameterivSGI(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetColorTableParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetColorTableParameteriv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3184,33 +2900,26 @@ __glXDisp_ColorSubTable(GLbyte * pc) const GLvoid *const data = (const GLvoid *) ((pc + 40)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_ColorSubTable(GET_DISPATCH(), (*(GLenum *) (pc + 20), - *(GLsizei *) (pc + 24), - *(GLsizei *) (pc + 28), - *(GLenum *) (pc + 32), - *(GLenum *) (pc + 36), data)); + glColorSubTable(*(GLenum *) (pc + 20), + *(GLsizei *) (pc + 24), + *(GLsizei *) (pc + 28), + *(GLenum *) (pc + 32), *(GLenum *) (pc + 36), data); } void __glXDisp_CopyColorSubTable(GLbyte * pc) { - CALL_CopyColorSubTable(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLsizei *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLsizei *) (pc + 16) - )); + glCopyColorSubTable(*(GLenum *) (pc + 0), + *(GLsizei *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), *(GLsizei *) (pc + 16)); } void @@ -3219,22 +2928,17 @@ __glXDisp_ConvolutionFilter1D(GLbyte * pc) const GLvoid *const image = (const GLvoid *) ((pc + 44)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_ConvolutionFilter1D(GET_DISPATCH(), (*(GLenum *) (pc + 20), - *(GLenum *) (pc + 24), - *(GLsizei *) (pc + 28), - *(GLenum *) (pc + 36), - *(GLenum *) (pc + 40), image)); + glConvolutionFilter1D(*(GLenum *) (pc + 20), + *(GLenum *) (pc + 24), + *(GLsizei *) (pc + 28), + *(GLenum *) (pc + 36), *(GLenum *) (pc + 40), image); } void @@ -3243,32 +2947,25 @@ __glXDisp_ConvolutionFilter2D(GLbyte * pc) const GLvoid *const image = (const GLvoid *) ((pc + 44)); __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); - CALL_ConvolutionFilter2D(GET_DISPATCH(), (*(GLenum *) (pc + 20), - *(GLenum *) (pc + 24), - *(GLsizei *) (pc + 28), - *(GLsizei *) (pc + 32), - *(GLenum *) (pc + 36), - *(GLenum *) (pc + 40), image)); + glConvolutionFilter2D(*(GLenum *) (pc + 20), + *(GLenum *) (pc + 24), + *(GLsizei *) (pc + 28), + *(GLsizei *) (pc + 32), + *(GLenum *) (pc + 36), *(GLenum *) (pc + 40), image); } void __glXDisp_ConvolutionParameterf(GLbyte * pc) { - CALL_ConvolutionParameterf(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLfloat *) (pc + 8) - )); + glConvolutionParameterf(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)); } void @@ -3279,17 +2976,14 @@ __glXDisp_ConvolutionParameterfv(GLbyte * pc) params = (const GLfloat *) (pc + 8); - CALL_ConvolutionParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glConvolutionParameterfv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_ConvolutionParameteri(GLbyte * pc) { - CALL_ConvolutionParameteri(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLint *) (pc + 8) - )); + glConvolutionParameteri(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLint *) (pc + 8)); } void @@ -3300,31 +2994,26 @@ __glXDisp_ConvolutionParameteriv(GLbyte * pc) params = (const GLint *) (pc + 8); - CALL_ConvolutionParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glConvolutionParameteriv(*(GLenum *) (pc + 0), pname, params); } void __glXDisp_CopyConvolutionFilter1D(GLbyte * pc) { - CALL_CopyConvolutionFilter1D(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLsizei *) (pc + 16) - )); + glCopyConvolutionFilter1D(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), *(GLsizei *) (pc + 16)); } void __glXDisp_CopyConvolutionFilter2D(GLbyte * pc) { - CALL_CopyConvolutionFilter2D(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLsizei *) (pc + 16), - *(GLsizei *) (pc + 20) - )); + glCopyConvolutionFilter2D(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), + *(GLsizei *) (pc + 16), *(GLsizei *) (pc + 20)); } int @@ -3348,8 +3037,7 @@ __glXDisp_GetConvolutionParameterfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetConvolutionParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetConvolutionParameterfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3378,8 +3066,7 @@ __glXDisp_GetConvolutionParameterfvEXT(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetConvolutionParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetConvolutionParameterfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3408,8 +3095,7 @@ __glXDisp_GetConvolutionParameteriv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetConvolutionParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetConvolutionParameteriv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3438,8 +3124,7 @@ __glXDisp_GetConvolutionParameterivEXT(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetConvolutionParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetConvolutionParameteriv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3468,8 +3153,7 @@ __glXDisp_GetHistogramParameterfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetHistogramParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetHistogramParameterfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3498,8 +3182,7 @@ __glXDisp_GetHistogramParameterfvEXT(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetHistogramParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetHistogramParameterfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3528,8 +3211,7 @@ __glXDisp_GetHistogramParameteriv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetHistogramParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetHistogramParameteriv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3558,8 +3240,7 @@ __glXDisp_GetHistogramParameterivEXT(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetHistogramParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetHistogramParameteriv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3588,8 +3269,7 @@ __glXDisp_GetMinmaxParameterfv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetMinmaxParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetMinmaxParameterfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3618,8 +3298,7 @@ __glXDisp_GetMinmaxParameterfvEXT(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetMinmaxParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetMinmaxParameterfv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3648,8 +3327,7 @@ __glXDisp_GetMinmaxParameteriv(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetMinmaxParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetMinmaxParameteriv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3678,8 +3356,7 @@ __glXDisp_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetMinmaxParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetMinmaxParameteriv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -3690,33 +3367,28 @@ __glXDisp_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc) void __glXDisp_Histogram(GLbyte * pc) { - CALL_Histogram(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLsizei *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLboolean *) (pc + 12) - )); + glHistogram(*(GLenum *) (pc + 0), + *(GLsizei *) (pc + 4), + *(GLenum *) (pc + 8), *(GLboolean *) (pc + 12)); } void __glXDisp_Minmax(GLbyte * pc) { - CALL_Minmax(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), *(GLboolean *) (pc + 8) - )); + glMinmax(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), *(GLboolean *) (pc + 8)); } void __glXDisp_ResetHistogram(GLbyte * pc) { - CALL_ResetHistogram(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glResetHistogram(*(GLenum *) (pc + 0)); } void __glXDisp_ResetMinmax(GLbyte * pc) { - CALL_ResetMinmax(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glResetMinmax(*(GLenum *) (pc + 0)); } void @@ -3727,30 +3399,23 @@ __glXDisp_TexImage3D(GLbyte * pc) (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80)); __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); - - CALL_TexImage3D(GET_DISPATCH(), (*(GLenum *) (pc + 36), - *(GLint *) (pc + 40), - *(GLint *) (pc + 44), - *(GLsizei *) (pc + 48), - *(GLsizei *) (pc + 52), - *(GLsizei *) (pc + 56), - *(GLint *) (pc + 64), - *(GLenum *) (pc + 68), - *(GLenum *) (pc + 72), pixels)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); + + glTexImage3D(*(GLenum *) (pc + 36), + *(GLint *) (pc + 40), + *(GLint *) (pc + 44), + *(GLsizei *) (pc + 48), + *(GLsizei *) (pc + 52), + *(GLsizei *) (pc + 56), + *(GLint *) (pc + 64), + *(GLenum *) (pc + 68), *(GLenum *) (pc + 72), pixels); } void @@ -3759,57 +3424,47 @@ __glXDisp_TexSubImage3D(GLbyte * pc) const GLvoid *const pixels = (const GLvoid *) ((pc + 88)); __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes)); - CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels)); - CALL_PixelStorei(GET_DISPATCH(), - (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment)); - - CALL_TexSubImage3D(GET_DISPATCH(), (*(GLenum *) (pc + 36), - *(GLint *) (pc + 40), - *(GLint *) (pc + 44), - *(GLint *) (pc + 48), - *(GLint *) (pc + 52), - *(GLsizei *) (pc + 60), - *(GLsizei *) (pc + 64), - *(GLsizei *) (pc + 68), - *(GLenum *) (pc + 76), - *(GLenum *) (pc + 80), pixels)); + glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes); + glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst); + glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength); + glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight); + glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows); + glPixelStorei(GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages); + glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels); + glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment); + + glTexSubImage3D(*(GLenum *) (pc + 36), + *(GLint *) (pc + 40), + *(GLint *) (pc + 44), + *(GLint *) (pc + 48), + *(GLint *) (pc + 52), + *(GLsizei *) (pc + 60), + *(GLsizei *) (pc + 64), + *(GLsizei *) (pc + 68), + *(GLenum *) (pc + 76), *(GLenum *) (pc + 80), pixels); } void __glXDisp_CopyTexSubImage3D(GLbyte * pc) { - CALL_CopyTexSubImage3D(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLint *) (pc + 16), - *(GLint *) (pc + 20), - *(GLint *) (pc + 24), - *(GLsizei *) (pc + 28), - *(GLsizei *) (pc + 32) - )); + glCopyTexSubImage3D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), + *(GLint *) (pc + 16), + *(GLint *) (pc + 20), + *(GLint *) (pc + 24), + *(GLsizei *) (pc + 28), *(GLsizei *) (pc + 32)); } void -__glXDisp_ActiveTextureARB(GLbyte * pc) +__glXDisp_ActiveTexture(GLbyte * pc) { - CALL_ActiveTextureARB(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); + glActiveTexture(*(GLenum *) (pc + 0)); } void -__glXDisp_MultiTexCoord1dvARB(GLbyte * pc) +__glXDisp_MultiTexCoord1dv(GLbyte * pc) { #ifdef __GLX_ALIGN64 if ((unsigned long) (pc) & 7) { @@ -3818,37 +3473,29 @@ __glXDisp_MultiTexCoord1dvARB(GLbyte * pc) } #endif - CALL_MultiTexCoord1dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 8), - (const GLdouble *) (pc + 0) - )); + glMultiTexCoord1dv(*(GLenum *) (pc + 8), (const GLdouble *) (pc + 0)); } void __glXDisp_MultiTexCoord1fvARB(GLbyte * pc) { - CALL_MultiTexCoord1fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glMultiTexCoord1fvARB(*(GLenum *) (pc + 0), (const GLfloat *) (pc + 4)); } void -__glXDisp_MultiTexCoord1ivARB(GLbyte * pc) +__glXDisp_MultiTexCoord1iv(GLbyte * pc) { - CALL_MultiTexCoord1ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLint *) (pc + 4) - )); + glMultiTexCoord1iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4)); } void -__glXDisp_MultiTexCoord1svARB(GLbyte * pc) +__glXDisp_MultiTexCoord1sv(GLbyte * pc) { - CALL_MultiTexCoord1svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glMultiTexCoord1sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4)); } void -__glXDisp_MultiTexCoord2dvARB(GLbyte * pc) +__glXDisp_MultiTexCoord2dv(GLbyte * pc) { #ifdef __GLX_ALIGN64 if ((unsigned long) (pc) & 7) { @@ -3857,37 +3504,29 @@ __glXDisp_MultiTexCoord2dvARB(GLbyte * pc) } #endif - CALL_MultiTexCoord2dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 16), - (const GLdouble *) (pc + 0) - )); + glMultiTexCoord2dv(*(GLenum *) (pc + 16), (const GLdouble *) (pc + 0)); } void __glXDisp_MultiTexCoord2fvARB(GLbyte * pc) { - CALL_MultiTexCoord2fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glMultiTexCoord2fvARB(*(GLenum *) (pc + 0), (const GLfloat *) (pc + 4)); } void -__glXDisp_MultiTexCoord2ivARB(GLbyte * pc) +__glXDisp_MultiTexCoord2iv(GLbyte * pc) { - CALL_MultiTexCoord2ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLint *) (pc + 4) - )); + glMultiTexCoord2iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4)); } void -__glXDisp_MultiTexCoord2svARB(GLbyte * pc) +__glXDisp_MultiTexCoord2sv(GLbyte * pc) { - CALL_MultiTexCoord2svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glMultiTexCoord2sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4)); } void -__glXDisp_MultiTexCoord3dvARB(GLbyte * pc) +__glXDisp_MultiTexCoord3dv(GLbyte * pc) { #ifdef __GLX_ALIGN64 if ((unsigned long) (pc) & 7) { @@ -3896,37 +3535,29 @@ __glXDisp_MultiTexCoord3dvARB(GLbyte * pc) } #endif - CALL_MultiTexCoord3dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 24), - (const GLdouble *) (pc + 0) - )); + glMultiTexCoord3dv(*(GLenum *) (pc + 24), (const GLdouble *) (pc + 0)); } void __glXDisp_MultiTexCoord3fvARB(GLbyte * pc) { - CALL_MultiTexCoord3fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glMultiTexCoord3fvARB(*(GLenum *) (pc + 0), (const GLfloat *) (pc + 4)); } void -__glXDisp_MultiTexCoord3ivARB(GLbyte * pc) +__glXDisp_MultiTexCoord3iv(GLbyte * pc) { - CALL_MultiTexCoord3ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLint *) (pc + 4) - )); + glMultiTexCoord3iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4)); } void -__glXDisp_MultiTexCoord3svARB(GLbyte * pc) +__glXDisp_MultiTexCoord3sv(GLbyte * pc) { - CALL_MultiTexCoord3svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glMultiTexCoord3sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4)); } void -__glXDisp_MultiTexCoord4dvARB(GLbyte * pc) +__glXDisp_MultiTexCoord4dv(GLbyte * pc) { #ifdef __GLX_ALIGN64 if ((unsigned long) (pc) & 7) { @@ -3935,250 +3566,277 @@ __glXDisp_MultiTexCoord4dvARB(GLbyte * pc) } #endif - CALL_MultiTexCoord4dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 32), - (const GLdouble *) (pc + 0) - )); + glMultiTexCoord4dv(*(GLenum *) (pc + 32), (const GLdouble *) (pc + 0)); } void __glXDisp_MultiTexCoord4fvARB(GLbyte * pc) { - CALL_MultiTexCoord4fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glMultiTexCoord4fvARB(*(GLenum *) (pc + 0), (const GLfloat *) (pc + 4)); } void -__glXDisp_MultiTexCoord4ivARB(GLbyte * pc) +__glXDisp_MultiTexCoord4iv(GLbyte * pc) { - CALL_MultiTexCoord4ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLint *) (pc + 4) - )); + glMultiTexCoord4iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4)); } void -__glXDisp_MultiTexCoord4svARB(GLbyte * pc) +__glXDisp_MultiTexCoord4sv(GLbyte * pc) { - CALL_MultiTexCoord4svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glMultiTexCoord4sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4)); } void -__glXDisp_SampleCoverageARB(GLbyte * pc) -{ - CALL_SampleCoverageARB(GET_DISPATCH(), (*(GLclampf *) (pc + 0), - *(GLboolean *) (pc + 4) - )); -} - -void -__glXDisp_CompressedTexImage1DARB(GLbyte * pc) +__glXDisp_CompressedTexImage1D(GLbyte * pc) { const GLsizei imageSize = *(GLsizei *) (pc + 20); - CALL_CompressedTexImage1DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLsizei *) (pc + 12), - *(GLint *) (pc + 16), - imageSize, - (const GLvoid *) (pc + 24) - )); + glCompressedTexImage1D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLenum *) (pc + 8), + *(GLsizei *) (pc + 12), + *(GLint *) (pc + 16), + imageSize, (const GLvoid *) (pc + 24)); } void -__glXDisp_CompressedTexImage2DARB(GLbyte * pc) +__glXDisp_CompressedTexImage2D(GLbyte * pc) { const GLsizei imageSize = *(GLsizei *) (pc + 24); - CALL_CompressedTexImage2DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLsizei *) (pc + 12), - *(GLsizei *) (pc + 16), - *(GLint *) (pc + 20), - imageSize, - (const GLvoid *) (pc + 28) - )); + glCompressedTexImage2D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLenum *) (pc + 8), + *(GLsizei *) (pc + 12), + *(GLsizei *) (pc + 16), + *(GLint *) (pc + 20), + imageSize, (const GLvoid *) (pc + 28)); } void -__glXDisp_CompressedTexImage3DARB(GLbyte * pc) +__glXDisp_CompressedTexImage3D(GLbyte * pc) { const GLsizei imageSize = *(GLsizei *) (pc + 28); - CALL_CompressedTexImage3DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLsizei *) (pc + 12), - *(GLsizei *) (pc + 16), - *(GLsizei *) (pc + 20), - *(GLint *) (pc + 24), - imageSize, - (const GLvoid *) (pc + 32) - )); + glCompressedTexImage3D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLenum *) (pc + 8), + *(GLsizei *) (pc + 12), + *(GLsizei *) (pc + 16), + *(GLsizei *) (pc + 20), + *(GLint *) (pc + 24), + imageSize, (const GLvoid *) (pc + 32)); } void -__glXDisp_CompressedTexSubImage1DARB(GLbyte * pc) +__glXDisp_CompressedTexSubImage1D(GLbyte * pc) { const GLsizei imageSize = *(GLsizei *) (pc + 20); - CALL_CompressedTexSubImage1DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLint *) (pc + 8), - *(GLsizei *) (pc + 12), - *(GLenum *) (pc + 16), - imageSize, - (const GLvoid *) (pc + 24) - )); + glCompressedTexSubImage1D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLint *) (pc + 8), + *(GLsizei *) (pc + 12), + *(GLenum *) (pc + 16), + imageSize, (const GLvoid *) (pc + 24)); } void -__glXDisp_CompressedTexSubImage2DARB(GLbyte * pc) +__glXDisp_CompressedTexSubImage2D(GLbyte * pc) { const GLsizei imageSize = *(GLsizei *) (pc + 28); - CALL_CompressedTexSubImage2DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLsizei *) (pc + 16), - *(GLsizei *) (pc + 20), - *(GLenum *) (pc + 24), - imageSize, - (const GLvoid *) (pc + 32) - )); + glCompressedTexSubImage2D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), + *(GLsizei *) (pc + 16), + *(GLsizei *) (pc + 20), + *(GLenum *) (pc + 24), + imageSize, (const GLvoid *) (pc + 32)); } void -__glXDisp_CompressedTexSubImage3DARB(GLbyte * pc) +__glXDisp_CompressedTexSubImage3D(GLbyte * pc) { const GLsizei imageSize = *(GLsizei *) (pc + 36); - CALL_CompressedTexSubImage3DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLint *) (pc + 16), - *(GLsizei *) (pc + 20), - *(GLsizei *) (pc + 24), - *(GLsizei *) (pc + 28), - *(GLenum *) (pc + 32), - imageSize, - (const GLvoid *) (pc + 40) - )); + glCompressedTexSubImage3D(*(GLenum *) (pc + 0), + *(GLint *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), + *(GLint *) (pc + 16), + *(GLsizei *) (pc + 20), + *(GLsizei *) (pc + 24), + *(GLsizei *) (pc + 28), + *(GLenum *) (pc + 32), + imageSize, (const GLvoid *) (pc + 40)); } -int -__glXDisp_GetProgramEnvParameterdvARB(__GLXclientState * cl, GLbyte * pc) +void +__glXDisp_SampleCoverage(GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); + glSampleCoverage(*(GLclampf *) (pc + 0), *(GLboolean *) (pc + 4)); +} - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLdouble params[4]; +void +__glXDisp_BlendFuncSeparate(GLbyte * pc) +{ + glBlendFuncSeparate(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLenum *) (pc + 8), *(GLenum *) (pc + 12)); +} - CALL_GetProgramEnvParameterdvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - params)); - __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0); - error = Success; +void +__glXDisp_FogCoorddv(GLbyte * pc) +{ +#ifdef __GLX_ALIGN64 + if ((unsigned long) (pc) & 7) { + (void) memmove(pc - 4, pc, 8); + pc -= 4; } +#endif - return error; + glFogCoorddv((const GLdouble *) (pc + 0)); } -int -__glXDisp_GetProgramEnvParameterfvARB(__GLXclientState * cl, GLbyte * pc) +void +__glXDisp_PointParameterf(GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); + glPointParameterf(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)); +} - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLfloat params[4]; +void +__glXDisp_PointParameterfv(GLbyte * pc) +{ + const GLenum pname = *(GLenum *) (pc + 0); + const GLfloat *params; - CALL_GetProgramEnvParameterfvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - params)); - __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0); - error = Success; - } + params = (const GLfloat *) (pc + 4); - return error; + glPointParameterfv(pname, params); } -int -__glXDisp_GetProgramLocalParameterdvARB(__GLXclientState * cl, GLbyte * pc) +void +__glXDisp_PointParameteri(GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); + glPointParameteri(*(GLenum *) (pc + 0), *(GLint *) (pc + 4)); +} - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLdouble params[4]; +void +__glXDisp_PointParameteriv(GLbyte * pc) +{ + const GLenum pname = *(GLenum *) (pc + 0); + const GLint *params; - CALL_GetProgramLocalParameterdvARB(GET_DISPATCH(), - (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), params)); - __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0); - error = Success; + params = (const GLint *) (pc + 4); + + glPointParameteriv(pname, params); +} + +void +__glXDisp_SecondaryColor3bv(GLbyte * pc) +{ + glSecondaryColor3bv((const GLbyte *) (pc + 0)); +} + +void +__glXDisp_SecondaryColor3dv(GLbyte * pc) +{ +#ifdef __GLX_ALIGN64 + if ((unsigned long) (pc) & 7) { + (void) memmove(pc - 4, pc, 24); + pc -= 4; } +#endif - return error; + glSecondaryColor3dv((const GLdouble *) (pc + 0)); +} + +void +__glXDisp_SecondaryColor3iv(GLbyte * pc) +{ + glSecondaryColor3iv((const GLint *) (pc + 0)); +} + +void +__glXDisp_SecondaryColor3sv(GLbyte * pc) +{ + glSecondaryColor3sv((const GLshort *) (pc + 0)); +} + +void +__glXDisp_SecondaryColor3ubv(GLbyte * pc) +{ + glSecondaryColor3ubv((const GLubyte *) (pc + 0)); +} + +void +__glXDisp_SecondaryColor3uiv(GLbyte * pc) +{ + glSecondaryColor3uiv((const GLuint *) (pc + 0)); +} + +void +__glXDisp_SecondaryColor3usv(GLbyte * pc) +{ + glSecondaryColor3usv((const GLushort *) (pc + 0)); +} + +void +__glXDisp_WindowPos3fv(GLbyte * pc) +{ + glWindowPos3fv((const GLfloat *) (pc + 0)); +} + +void +__glXDisp_BeginQuery(GLbyte * pc) +{ + glBeginQuery(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4)); } int -__glXDisp_GetProgramLocalParameterfvARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_DeleteQueries(__GLXclientState * cl, GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; + xGLXSingleReq *const req = (xGLXSingleReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_VENDPRIV_HDR_SIZE; + pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { - GLfloat params[4]; + const GLsizei n = *(GLsizei *) (pc + 0); - CALL_GetProgramLocalParameterfvARB(GET_DISPATCH(), - (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), params)); - __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0); + glDeleteQueries(n, (const GLuint *) (pc + 4)); error = Success; } return error; } +void +__glXDisp_EndQuery(GLbyte * pc) +{ + glEndQuery(*(GLenum *) (pc + 0)); +} + int -__glXDisp_GetProgramivARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GenQueries(__GLXclientState * cl, GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; + xGLXSingleReq *const req = (xGLXSingleReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_VENDPRIV_HDR_SIZE; + pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { - const GLenum pname = *(GLenum *) (pc + 4); - - const GLuint compsize = __glGetProgramivARB_size(pname); - GLint answerBuffer[200]; - GLint *params = - __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, - sizeof(answerBuffer), 4); - - if (params == NULL) - return BadAlloc; - __glXClearErrorOccured(); + const GLsizei n = *(GLsizei *) (pc + 0); - CALL_GetProgramivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); - __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); + GLuint answerBuffer[200]; + GLuint *ids = + __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), + 4); + glGenQueries(n, ids); + __glXSendReply(cl->client, ids, n, 4, GL_TRUE, 0); error = Success; } @@ -4186,29 +3844,28 @@ __glXDisp_GetProgramivARB(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_GetVertexAttribdvARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GetQueryObjectiv(__GLXclientState * cl, GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; + xGLXSingleReq *const req = (xGLXSingleReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_VENDPRIV_HDR_SIZE; + pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { const GLenum pname = *(GLenum *) (pc + 4); - const GLuint compsize = __glGetVertexAttribdvARB_size(pname); - GLdouble answerBuffer[200]; - GLdouble *params = - __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, - sizeof(answerBuffer), 8); + const GLuint compsize = __glGetQueryObjectiv_size(pname); + GLint answerBuffer[200]; + GLint *params = + __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, + sizeof(answerBuffer), 4); if (params == NULL) return BadAlloc; __glXClearErrorOccured(); - CALL_GetVertexAttribdvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - pname, params)); - __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0); + glGetQueryObjectiv(*(GLuint *) (pc + 0), pname, params); + __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -4216,19 +3873,19 @@ __glXDisp_GetVertexAttribdvARB(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GetQueryObjectuiv(__GLXclientState * cl, GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; + xGLXSingleReq *const req = (xGLXSingleReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_VENDPRIV_HDR_SIZE; + pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { const GLenum pname = *(GLenum *) (pc + 4); - const GLuint compsize = __glGetVertexAttribfvARB_size(pname); - GLfloat answerBuffer[200]; - GLfloat *params = + const GLuint compsize = __glGetQueryObjectuiv_size(pname); + GLuint answerBuffer[200]; + GLuint *params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4); @@ -4236,8 +3893,7 @@ __glXDisp_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetVertexAttribfvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - pname, params)); + glGetQueryObjectuiv(*(GLuint *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -4246,17 +3902,17 @@ __glXDisp_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GetQueryiv(__GLXclientState * cl, GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; + xGLXSingleReq *const req = (xGLXSingleReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_VENDPRIV_HDR_SIZE; + pc += __GLX_SINGLE_HDR_SIZE; if (cx != NULL) { const GLenum pname = *(GLenum *) (pc + 4); - const GLuint compsize = __glGetVertexAttribivARB_size(pname); + const GLuint compsize = __glGetQueryiv_size(pname); GLint answerBuffer[200]; GLint *params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, @@ -4266,8 +3922,7 @@ __glXDisp_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetVertexAttribivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - pname, params)); + glGetQueryiv(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -4275,70 +3930,41 @@ __glXDisp_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc) return error; } -void -__glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc) +int +__glXDisp_IsQuery(__GLXclientState * cl, GLbyte * pc) { -#ifdef __GLX_ALIGN64 - if ((unsigned long) (pc) & 7) { - (void) memmove(pc - 4, pc, 40); - pc -= 4; - } -#endif - - CALL_ProgramEnvParameter4dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - (const GLdouble *) (pc + 8) - )); -} + xGLXSingleReq *const req = (xGLXSingleReq *) pc; + int error; + __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); -void -__glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc) -{ - CALL_ProgramEnvParameter4fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - (const GLfloat *) (pc + 8) - )); -} + pc += __GLX_SINGLE_HDR_SIZE; + if (cx != NULL) { + GLboolean retval; -void -__glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc) -{ -#ifdef __GLX_ALIGN64 - if ((unsigned long) (pc) & 7) { - (void) memmove(pc - 4, pc, 40); - pc -= 4; + retval = glIsQuery(*(GLuint *) (pc + 0)); + __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); + error = Success; } -#endif - CALL_ProgramLocalParameter4dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - (const GLdouble *) (pc + - 8) - )); + return error; } void -__glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc) +__glXDisp_BlendEquationSeparate(GLbyte * pc) { - CALL_ProgramLocalParameter4fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - (const GLfloat *) (pc + 8) - )); + glBlendEquationSeparate(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)); } void -__glXDisp_ProgramStringARB(GLbyte * pc) +__glXDisp_DrawBuffers(GLbyte * pc) { - const GLsizei len = *(GLsizei *) (pc + 8); + const GLsizei n = *(GLsizei *) (pc + 0); - CALL_ProgramStringARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - len, (const GLvoid *) (pc + 12) - )); + glDrawBuffers(n, (const GLenum *) (pc + 4)); } void -__glXDisp_VertexAttrib1dvARB(GLbyte * pc) +__glXDisp_VertexAttrib1dv(GLbyte * pc) { #ifdef __GLX_ALIGN64 if ((unsigned long) (pc) & 7) { @@ -4347,29 +3973,17 @@ __glXDisp_VertexAttrib1dvARB(GLbyte * pc) } #endif - CALL_VertexAttrib1dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLdouble *) (pc + 4) - )); + glVertexAttrib1dv(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4)); } void -__glXDisp_VertexAttrib1fvARB(GLbyte * pc) +__glXDisp_VertexAttrib1sv(GLbyte * pc) { - CALL_VertexAttrib1fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glVertexAttrib1sv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4)); } void -__glXDisp_VertexAttrib1svARB(GLbyte * pc) -{ - CALL_VertexAttrib1svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLshort *) (pc + 4) - )); -} - -void -__glXDisp_VertexAttrib2dvARB(GLbyte * pc) +__glXDisp_VertexAttrib2dv(GLbyte * pc) { #ifdef __GLX_ALIGN64 if ((unsigned long) (pc) & 7) { @@ -4378,29 +3992,17 @@ __glXDisp_VertexAttrib2dvARB(GLbyte * pc) } #endif - CALL_VertexAttrib2dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLdouble *) (pc + 4) - )); -} - -void -__glXDisp_VertexAttrib2fvARB(GLbyte * pc) -{ - CALL_VertexAttrib2fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glVertexAttrib2dv(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4)); } void -__glXDisp_VertexAttrib2svARB(GLbyte * pc) +__glXDisp_VertexAttrib2sv(GLbyte * pc) { - CALL_VertexAttrib2svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glVertexAttrib2sv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4)); } void -__glXDisp_VertexAttrib3dvARB(GLbyte * pc) +__glXDisp_VertexAttrib3dv(GLbyte * pc) { #ifdef __GLX_ALIGN64 if ((unsigned long) (pc) & 7) { @@ -4409,85 +4011,59 @@ __glXDisp_VertexAttrib3dvARB(GLbyte * pc) } #endif - CALL_VertexAttrib3dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLdouble *) (pc + 4) - )); -} - -void -__glXDisp_VertexAttrib3fvARB(GLbyte * pc) -{ - CALL_VertexAttrib3fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glVertexAttrib3dv(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4)); } void -__glXDisp_VertexAttrib3svARB(GLbyte * pc) +__glXDisp_VertexAttrib3sv(GLbyte * pc) { - CALL_VertexAttrib3svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glVertexAttrib3sv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4)); } void -__glXDisp_VertexAttrib4NbvARB(GLbyte * pc) +__glXDisp_VertexAttrib4Nbv(GLbyte * pc) { - CALL_VertexAttrib4NbvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLbyte *) (pc + 4) - )); + glVertexAttrib4Nbv(*(GLuint *) (pc + 0), (const GLbyte *) (pc + 4)); } void -__glXDisp_VertexAttrib4NivARB(GLbyte * pc) +__glXDisp_VertexAttrib4Niv(GLbyte * pc) { - CALL_VertexAttrib4NivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLint *) (pc + 4) - )); + glVertexAttrib4Niv(*(GLuint *) (pc + 0), (const GLint *) (pc + 4)); } void -__glXDisp_VertexAttrib4NsvARB(GLbyte * pc) +__glXDisp_VertexAttrib4Nsv(GLbyte * pc) { - CALL_VertexAttrib4NsvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glVertexAttrib4Nsv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4)); } void -__glXDisp_VertexAttrib4NubvARB(GLbyte * pc) +__glXDisp_VertexAttrib4Nubv(GLbyte * pc) { - CALL_VertexAttrib4NubvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLubyte *) (pc + 4) - )); + glVertexAttrib4Nubv(*(GLuint *) (pc + 0), (const GLubyte *) (pc + 4)); } void -__glXDisp_VertexAttrib4NuivARB(GLbyte * pc) +__glXDisp_VertexAttrib4Nuiv(GLbyte * pc) { - CALL_VertexAttrib4NuivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLuint *) (pc + 4) - )); + glVertexAttrib4Nuiv(*(GLuint *) (pc + 0), (const GLuint *) (pc + 4)); } void -__glXDisp_VertexAttrib4NusvARB(GLbyte * pc) +__glXDisp_VertexAttrib4Nusv(GLbyte * pc) { - CALL_VertexAttrib4NusvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLushort *) (pc + 4) - )); + glVertexAttrib4Nusv(*(GLuint *) (pc + 0), (const GLushort *) (pc + 4)); } void -__glXDisp_VertexAttrib4bvARB(GLbyte * pc) +__glXDisp_VertexAttrib4bv(GLbyte * pc) { - CALL_VertexAttrib4bvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLbyte *) (pc + 4) - )); + glVertexAttrib4bv(*(GLuint *) (pc + 0), (const GLbyte *) (pc + 4)); } void -__glXDisp_VertexAttrib4dvARB(GLbyte * pc) +__glXDisp_VertexAttrib4dv(GLbyte * pc) { #ifdef __GLX_ALIGN64 if ((unsigned long) (pc) & 7) { @@ -4496,110 +4072,86 @@ __glXDisp_VertexAttrib4dvARB(GLbyte * pc) } #endif - CALL_VertexAttrib4dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLdouble *) (pc + 4) - )); + glVertexAttrib4dv(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4)); } void -__glXDisp_VertexAttrib4fvARB(GLbyte * pc) +__glXDisp_VertexAttrib4iv(GLbyte * pc) { - CALL_VertexAttrib4fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glVertexAttrib4iv(*(GLuint *) (pc + 0), (const GLint *) (pc + 4)); } void -__glXDisp_VertexAttrib4ivARB(GLbyte * pc) +__glXDisp_VertexAttrib4sv(GLbyte * pc) { - CALL_VertexAttrib4ivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLint *) (pc + 4) - )); + glVertexAttrib4sv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4)); } void -__glXDisp_VertexAttrib4svARB(GLbyte * pc) +__glXDisp_VertexAttrib4ubv(GLbyte * pc) { - CALL_VertexAttrib4svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glVertexAttrib4ubv(*(GLuint *) (pc + 0), (const GLubyte *) (pc + 4)); } void -__glXDisp_VertexAttrib4ubvARB(GLbyte * pc) +__glXDisp_VertexAttrib4uiv(GLbyte * pc) { - CALL_VertexAttrib4ubvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLubyte *) (pc + 4) - )); + glVertexAttrib4uiv(*(GLuint *) (pc + 0), (const GLuint *) (pc + 4)); } void -__glXDisp_VertexAttrib4uivARB(GLbyte * pc) +__glXDisp_VertexAttrib4usv(GLbyte * pc) { - CALL_VertexAttrib4uivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLuint *) (pc + 4) - )); + glVertexAttrib4usv(*(GLuint *) (pc + 0), (const GLushort *) (pc + 4)); } void -__glXDisp_VertexAttrib4usvARB(GLbyte * pc) +__glXDisp_ClampColor(GLbyte * pc) { - CALL_VertexAttrib4usvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLushort *) (pc + 4) - )); + glClampColor(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)); } void -__glXDisp_BeginQueryARB(GLbyte * pc) +__glXDisp_BindProgramARB(GLbyte * pc) { - CALL_BeginQueryARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4) - )); + glBindProgramARB(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4)); } int -__glXDisp_DeleteQueriesARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_DeleteProgramsARB(__GLXclientState * cl, GLbyte * pc) { - xGLXSingleReq *const req = (xGLXSingleReq *) pc; + xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_SINGLE_HDR_SIZE; + pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { const GLsizei n = *(GLsizei *) (pc + 0); - CALL_DeleteQueriesARB(GET_DISPATCH(), (n, (const GLuint *) (pc + 4) - )); + glDeleteProgramsARB(n, (const GLuint *) (pc + 4)); error = Success; } return error; } -void -__glXDisp_EndQueryARB(GLbyte * pc) -{ - CALL_EndQueryARB(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); -} - int -__glXDisp_GenQueriesARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GenProgramsARB(__GLXclientState * cl, GLbyte * pc) { - xGLXSingleReq *const req = (xGLXSingleReq *) pc; + xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_SINGLE_HDR_SIZE; + pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { const GLsizei n = *(GLsizei *) (pc + 0); GLuint answerBuffer[200]; - GLuint *ids = + GLuint *programs = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4); - CALL_GenQueriesARB(GET_DISPATCH(), (n, ids)); - __glXSendReply(cl->client, ids, n, 4, GL_TRUE, 0); + glGenProgramsARB(n, programs); + __glXSendReply(cl->client, programs, n, 4, GL_TRUE, 0); error = Success; } @@ -4607,29 +4159,39 @@ __glXDisp_GenQueriesARB(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_GetQueryObjectivARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GetProgramEnvParameterdvARB(__GLXclientState * cl, GLbyte * pc) { - xGLXSingleReq *const req = (xGLXSingleReq *) pc; + xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_SINGLE_HDR_SIZE; + pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { - const GLenum pname = *(GLenum *) (pc + 4); + GLdouble params[4]; - const GLuint compsize = __glGetQueryObjectivARB_size(pname); - GLint answerBuffer[200]; - GLint *params = - __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, - sizeof(answerBuffer), 4); + glGetProgramEnvParameterdvARB(*(GLenum *) (pc + 0), + *(GLuint *) (pc + 4), params); + __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0); + error = Success; + } - if (params == NULL) - return BadAlloc; - __glXClearErrorOccured(); + return error; +} - CALL_GetQueryObjectivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - pname, params)); - __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); +int +__glXDisp_GetProgramEnvParameterfvARB(__GLXclientState * cl, GLbyte * pc) +{ + xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; + int error; + __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); + + pc += __GLX_VENDPRIV_HDR_SIZE; + if (cx != NULL) { + GLfloat params[4]; + + glGetProgramEnvParameterfvARB(*(GLenum *) (pc + 0), + *(GLuint *) (pc + 4), params); + __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0); error = Success; } @@ -4637,29 +4199,39 @@ __glXDisp_GetQueryObjectivARB(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_GetQueryObjectuivARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GetProgramLocalParameterdvARB(__GLXclientState * cl, GLbyte * pc) { - xGLXSingleReq *const req = (xGLXSingleReq *) pc; + xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_SINGLE_HDR_SIZE; + pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { - const GLenum pname = *(GLenum *) (pc + 4); + GLdouble params[4]; - const GLuint compsize = __glGetQueryObjectuivARB_size(pname); - GLuint answerBuffer[200]; - GLuint *params = - __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, - sizeof(answerBuffer), 4); + glGetProgramLocalParameterdvARB(*(GLenum *) (pc + 0), + *(GLuint *) (pc + 4), params); + __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0); + error = Success; + } - if (params == NULL) - return BadAlloc; - __glXClearErrorOccured(); + return error; +} - CALL_GetQueryObjectuivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0), - pname, params)); - __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); +int +__glXDisp_GetProgramLocalParameterfvARB(__GLXclientState * cl, GLbyte * pc) +{ + xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; + int error; + __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); + + pc += __GLX_VENDPRIV_HDR_SIZE; + if (cx != NULL) { + GLfloat params[4]; + + glGetProgramLocalParameterfvARB(*(GLenum *) (pc + 0), + *(GLuint *) (pc + 4), params); + __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0); error = Success; } @@ -4667,17 +4239,17 @@ __glXDisp_GetQueryObjectuivARB(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_GetQueryivARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GetProgramivARB(__GLXclientState * cl, GLbyte * pc) { - xGLXSingleReq *const req = (xGLXSingleReq *) pc; + xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_SINGLE_HDR_SIZE; + pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { const GLenum pname = *(GLenum *) (pc + 4); - const GLuint compsize = __glGetQueryivARB_size(pname); + const GLuint compsize = __glGetProgramivARB_size(pname); GLint answerBuffer[200]; GLint *params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, @@ -4687,8 +4259,7 @@ __glXDisp_GetQueryivARB(__GLXclientState * cl, GLbyte * pc) return BadAlloc; __glXClearErrorOccured(); - CALL_GetQueryivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - pname, params)); + glGetProgramivARB(*(GLenum *) (pc + 0), pname, params); __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); error = Success; } @@ -4697,18 +4268,17 @@ __glXDisp_GetQueryivARB(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_IsQueryARB(__GLXclientState * cl, GLbyte * pc) +__glXDisp_IsProgramARB(__GLXclientState * cl, GLbyte * pc) { - xGLXSingleReq *const req = (xGLXSingleReq *) pc; + xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - pc += __GLX_SINGLE_HDR_SIZE; + pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { GLboolean retval; - retval = CALL_IsQueryARB(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + retval = glIsProgramARB(*(GLuint *) (pc + 0)); __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -4717,170 +4287,112 @@ __glXDisp_IsQueryARB(__GLXclientState * cl, GLbyte * pc) } void -__glXDisp_DrawBuffersARB(GLbyte * pc) -{ - const GLsizei n = *(GLsizei *) (pc + 0); - - CALL_DrawBuffersARB(GET_DISPATCH(), (n, (const GLenum *) (pc + 4) - )); -} - -void -__glXDisp_ClampColorARB(GLbyte * pc) -{ - CALL_ClampColorARB(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4) - )); -} - -void -__glXDisp_RenderbufferStorageMultisample(GLbyte * pc) -{ - CALL_RenderbufferStorageMultisample(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLsizei *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLsizei *) (pc + 12), - *(GLsizei *) (pc + 16) - )); -} - -void -__glXDisp_SampleMaskSGIS(GLbyte * pc) -{ - CALL_SampleMaskSGIS(GET_DISPATCH(), (*(GLclampf *) (pc + 0), - *(GLboolean *) (pc + 4) - )); -} - -void -__glXDisp_SamplePatternSGIS(GLbyte * pc) -{ - CALL_SamplePatternSGIS(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); -} - -void -__glXDisp_PointParameterfEXT(GLbyte * pc) -{ - CALL_PointParameterfEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLfloat *) (pc + 4) - )); -} - -void -__glXDisp_PointParameterfvEXT(GLbyte * pc) +__glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc) { - const GLenum pname = *(GLenum *) (pc + 0); - const GLfloat *params; - - params = (const GLfloat *) (pc + 4); +#ifdef __GLX_ALIGN64 + if ((unsigned long) (pc) & 7) { + (void) memmove(pc - 4, pc, 40); + pc -= 4; + } +#endif - CALL_PointParameterfvEXT(GET_DISPATCH(), (pname, params)); + glProgramEnvParameter4dvARB(*(GLenum *) (pc + 0), + *(GLuint *) (pc + 4), + (const GLdouble *) (pc + 8)); } void -__glXDisp_SecondaryColor3bvEXT(GLbyte * pc) +__glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc) { - CALL_SecondaryColor3bvEXT(GET_DISPATCH(), ((const GLbyte *) (pc + 0) - )); + glProgramEnvParameter4fvARB(*(GLenum *) (pc + 0), + *(GLuint *) (pc + 4), + (const GLfloat *) (pc + 8)); } void -__glXDisp_SecondaryColor3dvEXT(GLbyte * pc) +__glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc) { #ifdef __GLX_ALIGN64 if ((unsigned long) (pc) & 7) { - (void) memmove(pc - 4, pc, 24); + (void) memmove(pc - 4, pc, 40); pc -= 4; } #endif - CALL_SecondaryColor3dvEXT(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glProgramLocalParameter4dvARB(*(GLenum *) (pc + 0), + *(GLuint *) (pc + 4), + (const GLdouble *) (pc + 8)); } void -__glXDisp_SecondaryColor3fvEXT(GLbyte * pc) +__glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc) { - CALL_SecondaryColor3fvEXT(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glProgramLocalParameter4fvARB(*(GLenum *) (pc + 0), + *(GLuint *) (pc + 4), + (const GLfloat *) (pc + 8)); } void -__glXDisp_SecondaryColor3ivEXT(GLbyte * pc) +__glXDisp_ProgramStringARB(GLbyte * pc) { - CALL_SecondaryColor3ivEXT(GET_DISPATCH(), ((const GLint *) (pc + 0) - )); -} + const GLsizei len = *(GLsizei *) (pc + 8); -void -__glXDisp_SecondaryColor3svEXT(GLbyte * pc) -{ - CALL_SecondaryColor3svEXT(GET_DISPATCH(), ((const GLshort *) (pc + 0) - )); + glProgramStringARB(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), len, (const GLvoid *) (pc + 12)); } void -__glXDisp_SecondaryColor3ubvEXT(GLbyte * pc) +__glXDisp_VertexAttrib1fvARB(GLbyte * pc) { - CALL_SecondaryColor3ubvEXT(GET_DISPATCH(), ((const GLubyte *) (pc + 0) - )); + glVertexAttrib1fvARB(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4)); } void -__glXDisp_SecondaryColor3uivEXT(GLbyte * pc) +__glXDisp_VertexAttrib2fvARB(GLbyte * pc) { - CALL_SecondaryColor3uivEXT(GET_DISPATCH(), ((const GLuint *) (pc + 0) - )); + glVertexAttrib2fvARB(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4)); } void -__glXDisp_SecondaryColor3usvEXT(GLbyte * pc) +__glXDisp_VertexAttrib3fvARB(GLbyte * pc) { - CALL_SecondaryColor3usvEXT(GET_DISPATCH(), ((const GLushort *) (pc + 0) - )); + glVertexAttrib3fvARB(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4)); } void -__glXDisp_FogCoorddvEXT(GLbyte * pc) +__glXDisp_VertexAttrib4fvARB(GLbyte * pc) { -#ifdef __GLX_ALIGN64 - if ((unsigned long) (pc) & 7) { - (void) memmove(pc - 4, pc, 8); - pc -= 4; - } -#endif - - CALL_FogCoorddvEXT(GET_DISPATCH(), ((const GLdouble *) (pc + 0) - )); + glVertexAttrib4fvARB(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4)); } void -__glXDisp_FogCoordfvEXT(GLbyte * pc) +__glXDisp_BindFramebuffer(GLbyte * pc) { - CALL_FogCoordfvEXT(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glBindFramebuffer(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4)); } void -__glXDisp_BlendFuncSeparateEXT(GLbyte * pc) +__glXDisp_BindRenderbuffer(GLbyte * pc) { - CALL_BlendFuncSeparateEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLenum *) (pc + 12) - )); + glBindRenderbuffer(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4)); } void -__glXDisp_WindowPos3fvMESA(GLbyte * pc) +__glXDisp_BlitFramebuffer(GLbyte * pc) { - CALL_WindowPos3fvMESA(GET_DISPATCH(), ((const GLfloat *) (pc + 0) - )); + glBlitFramebuffer(*(GLint *) (pc + 0), + *(GLint *) (pc + 4), + *(GLint *) (pc + 8), + *(GLint *) (pc + 12), + *(GLint *) (pc + 16), + *(GLint *) (pc + 20), + *(GLint *) (pc + 24), + *(GLint *) (pc + 28), + *(GLbitfield *) (pc + 32), *(GLenum *) (pc + 36)); } int -__glXDisp_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc) +__glXDisp_CheckFramebufferStatus(__GLXclientState * cl, GLbyte * pc) { xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; @@ -4888,17 +4400,10 @@ __glXDisp_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc) pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { - const GLsizei n = *(GLsizei *) (pc + 0); + GLenum retval; - GLboolean retval; - GLboolean answerBuffer[200]; - GLboolean *residences = - __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1); - retval = - CALL_AreProgramsResidentNV(GET_DISPATCH(), - (n, (const GLuint *) (pc + 4), - residences)); - __glXSendReply(cl->client, residences, n, 1, GL_FALSE, retval); + retval = glCheckFramebufferStatus(*(GLenum *) (pc + 0)); + __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -4906,88 +4411,68 @@ __glXDisp_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc) } void -__glXDisp_BindProgramNV(GLbyte * pc) +__glXDisp_DeleteFramebuffers(GLbyte * pc) { - CALL_BindProgramNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4) - )); + const GLsizei n = *(GLsizei *) (pc + 0); + + glDeleteFramebuffers(n, (const GLuint *) (pc + 4)); } -int -__glXDisp_DeleteProgramsNV(__GLXclientState * cl, GLbyte * pc) +void +__glXDisp_DeleteRenderbuffers(GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - const GLsizei n = *(GLsizei *) (pc + 0); - - CALL_DeleteProgramsNV(GET_DISPATCH(), (n, (const GLuint *) (pc + 4) - )); - error = Success; - } + const GLsizei n = *(GLsizei *) (pc + 0); - return error; + glDeleteRenderbuffers(n, (const GLuint *) (pc + 4)); } void -__glXDisp_ExecuteProgramNV(GLbyte * pc) +__glXDisp_FramebufferRenderbuffer(GLbyte * pc) { - CALL_ExecuteProgramNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - (const GLfloat *) (pc + 8) - )); + glFramebufferRenderbuffer(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLenum *) (pc + 8), *(GLuint *) (pc + 12)); } -int -__glXDisp_GenProgramsNV(__GLXclientState * cl, GLbyte * pc) +void +__glXDisp_FramebufferTexture1D(GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - const GLsizei n = *(GLsizei *) (pc + 0); - - GLuint answerBuffer[200]; - GLuint *programs = - __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), - 4); - CALL_GenProgramsNV(GET_DISPATCH(), (n, programs)); - __glXSendReply(cl->client, programs, n, 4, GL_TRUE, 0); - error = Success; - } - - return error; + glFramebufferTexture1D(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLenum *) (pc + 8), + *(GLuint *) (pc + 12), *(GLint *) (pc + 16)); } -int -__glXDisp_GetProgramParameterdvNV(__GLXclientState * cl, GLbyte * pc) +void +__glXDisp_FramebufferTexture2D(GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLdouble params[4]; + glFramebufferTexture2D(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLenum *) (pc + 8), + *(GLuint *) (pc + 12), *(GLint *) (pc + 16)); +} - CALL_GetProgramParameterdvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - *(GLenum *) (pc + 8), - params)); - __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0); - error = Success; - } +void +__glXDisp_FramebufferTexture3D(GLbyte * pc) +{ + glFramebufferTexture3D(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLenum *) (pc + 8), + *(GLuint *) (pc + 12), + *(GLint *) (pc + 16), *(GLint *) (pc + 20)); +} - return error; +void +__glXDisp_FramebufferTextureLayer(GLbyte * pc) +{ + glFramebufferTextureLayer(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLuint *) (pc + 8), + *(GLint *) (pc + 12), *(GLint *) (pc + 16)); } int -__glXDisp_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GenFramebuffers(__GLXclientState * cl, GLbyte * pc) { xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; @@ -4995,13 +4480,14 @@ __glXDisp_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc) pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { - GLfloat params[4]; + const GLsizei n = *(GLsizei *) (pc + 0); - CALL_GetProgramParameterfvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - *(GLenum *) (pc + 8), - params)); - __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0); + GLuint answerBuffer[200]; + GLuint *framebuffers = + __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), + 4); + glGenFramebuffers(n, framebuffers); + __glXSendReply(cl->client, framebuffers, n, 4, GL_TRUE, 0); error = Success; } @@ -5009,7 +4495,7 @@ __glXDisp_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_GetProgramivNV(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GenRenderbuffers(__GLXclientState * cl, GLbyte * pc) { xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; @@ -5017,50 +4503,29 @@ __glXDisp_GetProgramivNV(__GLXclientState * cl, GLbyte * pc) pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { - const GLenum pname = *(GLenum *) (pc + 4); - - const GLuint compsize = __glGetProgramivNV_size(pname); - GLint answerBuffer[200]; - GLint *params = - __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, - sizeof(answerBuffer), 4); - - if (params == NULL) - return BadAlloc; - __glXClearErrorOccured(); + const GLsizei n = *(GLsizei *) (pc + 0); - CALL_GetProgramivNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - pname, params)); - __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); + GLuint answerBuffer[200]; + GLuint *renderbuffers = + __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), + 4); + glGenRenderbuffers(n, renderbuffers); + __glXSendReply(cl->client, renderbuffers, n, 4, GL_TRUE, 0); error = Success; } return error; } -int -__glXDisp_GetTrackMatrixivNV(__GLXclientState * cl, GLbyte * pc) +void +__glXDisp_GenerateMipmap(GLbyte * pc) { - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLint params[1]; - - CALL_GetTrackMatrixivNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - *(GLenum *) (pc + 8), params)); - __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0); - error = Success; - } - - return error; + glGenerateMipmap(*(GLenum *) (pc + 0)); } int -__glXDisp_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GetFramebufferAttachmentParameteriv(__GLXclientState * cl, + GLbyte * pc) { xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; @@ -5068,21 +4533,12 @@ __glXDisp_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc) pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { - const GLenum pname = *(GLenum *) (pc + 4); - - const GLuint compsize = __glGetVertexAttribdvNV_size(pname); - GLdouble answerBuffer[200]; - GLdouble *params = - __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, - sizeof(answerBuffer), 8); - - if (params == NULL) - return BadAlloc; - __glXClearErrorOccured(); + GLint params[1]; - CALL_GetVertexAttribdvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - pname, params)); - __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0); + glGetFramebufferAttachmentParameteriv(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLenum *) (pc + 8), params); + __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0); error = Success; } @@ -5090,7 +4546,7 @@ __glXDisp_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc) +__glXDisp_GetRenderbufferParameteriv(__GLXclientState * cl, GLbyte * pc) { xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; @@ -5098,21 +4554,11 @@ __glXDisp_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc) pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { - const GLenum pname = *(GLenum *) (pc + 4); - - const GLuint compsize = __glGetVertexAttribfvNV_size(pname); - GLfloat answerBuffer[200]; - GLfloat *params = - __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, - sizeof(answerBuffer), 4); - - if (params == NULL) - return BadAlloc; - __glXClearErrorOccured(); + GLint params[1]; - CALL_GetVertexAttribfvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - pname, params)); - __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); + glGetRenderbufferParameteriv(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), params); + __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0); error = Success; } @@ -5120,7 +4566,7 @@ __glXDisp_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc) +__glXDisp_IsFramebuffer(__GLXclientState * cl, GLbyte * pc) { xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; @@ -5128,21 +4574,10 @@ __glXDisp_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc) pc += __GLX_VENDPRIV_HDR_SIZE; if (cx != NULL) { - const GLenum pname = *(GLenum *) (pc + 4); - - const GLuint compsize = __glGetVertexAttribivNV_size(pname); - GLint answerBuffer[200]; - GLint *params = - __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, - sizeof(answerBuffer), 4); - - if (params == NULL) - return BadAlloc; - __glXClearErrorOccured(); + GLboolean retval; - CALL_GetVertexAttribivNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - pname, params)); - __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0); + retval = glIsFramebuffer(*(GLuint *) (pc + 0)); + __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -5150,7 +4585,7 @@ __glXDisp_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc) } int -__glXDisp_IsProgramNV(__GLXclientState * cl, GLbyte * pc) +__glXDisp_IsRenderbuffer(__GLXclientState * cl, GLbyte * pc) { xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; int error; @@ -5160,8 +4595,7 @@ __glXDisp_IsProgramNV(__GLXclientState * cl, GLbyte * pc) if (cx != NULL) { GLboolean retval; - retval = CALL_IsProgramNV(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); + retval = glIsRenderbuffer(*(GLuint *) (pc + 0)); __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); error = Success; } @@ -5170,66 +4604,33 @@ __glXDisp_IsProgramNV(__GLXclientState * cl, GLbyte * pc) } void -__glXDisp_LoadProgramNV(GLbyte * pc) +__glXDisp_RenderbufferStorage(GLbyte * pc) { - const GLsizei len = *(GLsizei *) (pc + 8); - - CALL_LoadProgramNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - len, (const GLubyte *) (pc + 12) - )); + glRenderbufferStorage(*(GLenum *) (pc + 0), + *(GLenum *) (pc + 4), + *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12)); } void -__glXDisp_ProgramParameters4dvNV(GLbyte * pc) -{ - const GLsizei num = *(GLsizei *) (pc + 8); - -#ifdef __GLX_ALIGN64 - const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4; - - if ((unsigned long) (pc) & 7) { - (void) memmove(pc - 4, pc, cmdlen); - pc -= 4; - } -#endif - - CALL_ProgramParameters4dvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - num, - (const GLdouble *) (pc + 12) - )); -} - -void -__glXDisp_ProgramParameters4fvNV(GLbyte * pc) +__glXDisp_RenderbufferStorageMultisample(GLbyte * pc) { - const GLsizei num = *(GLsizei *) (pc + 8); - - CALL_ProgramParameters4fvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - num, - (const GLfloat *) (pc + 12) - )); + glRenderbufferStorageMultisample(*(GLenum *) (pc + 0), + *(GLsizei *) (pc + 4), + *(GLenum *) (pc + 8), + *(GLsizei *) (pc + 12), + *(GLsizei *) (pc + 16)); } void -__glXDisp_RequestResidentProgramsNV(GLbyte * pc) +__glXDisp_SecondaryColor3fvEXT(GLbyte * pc) { - const GLsizei n = *(GLsizei *) (pc + 0); - - CALL_RequestResidentProgramsNV(GET_DISPATCH(), (n, (const GLuint *) (pc + 4) - )); + glSecondaryColor3fvEXT((const GLfloat *) (pc + 0)); } void -__glXDisp_TrackMatrixNV(GLbyte * pc) +__glXDisp_FogCoordfvEXT(GLbyte * pc) { - CALL_TrackMatrixNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLenum *) (pc + 12) - )); + glFogCoordfvEXT((const GLfloat *) (pc + 0)); } void @@ -5242,25 +4643,19 @@ __glXDisp_VertexAttrib1dvNV(GLbyte * pc) } #endif - CALL_VertexAttrib1dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLdouble *) (pc + 4) - )); + glVertexAttrib1dvNV(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4)); } void __glXDisp_VertexAttrib1fvNV(GLbyte * pc) { - CALL_VertexAttrib1fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glVertexAttrib1fvNV(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4)); } void __glXDisp_VertexAttrib1svNV(GLbyte * pc) { - CALL_VertexAttrib1svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glVertexAttrib1svNV(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4)); } void @@ -5273,25 +4668,19 @@ __glXDisp_VertexAttrib2dvNV(GLbyte * pc) } #endif - CALL_VertexAttrib2dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLdouble *) (pc + 4) - )); + glVertexAttrib2dvNV(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4)); } void __glXDisp_VertexAttrib2fvNV(GLbyte * pc) { - CALL_VertexAttrib2fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glVertexAttrib2fvNV(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4)); } void __glXDisp_VertexAttrib2svNV(GLbyte * pc) { - CALL_VertexAttrib2svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glVertexAttrib2svNV(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4)); } void @@ -5304,25 +4693,19 @@ __glXDisp_VertexAttrib3dvNV(GLbyte * pc) } #endif - CALL_VertexAttrib3dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLdouble *) (pc + 4) - )); + glVertexAttrib3dvNV(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4)); } void __glXDisp_VertexAttrib3fvNV(GLbyte * pc) { - CALL_VertexAttrib3fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glVertexAttrib3fvNV(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4)); } void __glXDisp_VertexAttrib3svNV(GLbyte * pc) { - CALL_VertexAttrib3svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glVertexAttrib3svNV(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4)); } void @@ -5335,33 +4718,25 @@ __glXDisp_VertexAttrib4dvNV(GLbyte * pc) } #endif - CALL_VertexAttrib4dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLdouble *) (pc + 4) - )); + glVertexAttrib4dvNV(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4)); } void __glXDisp_VertexAttrib4fvNV(GLbyte * pc) { - CALL_VertexAttrib4fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLfloat *) (pc + 4) - )); + glVertexAttrib4fvNV(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4)); } void __glXDisp_VertexAttrib4svNV(GLbyte * pc) { - CALL_VertexAttrib4svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLshort *) (pc + 4) - )); + glVertexAttrib4svNV(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4)); } void __glXDisp_VertexAttrib4ubvNV(GLbyte * pc) { - CALL_VertexAttrib4ubvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - (const GLubyte *) (pc + 4) - )); + glVertexAttrib4ubvNV(*(GLuint *) (pc + 0), (const GLubyte *) (pc + 4)); } void @@ -5378,9 +4753,7 @@ __glXDisp_VertexAttribs1dvNV(GLbyte * pc) } #endif - CALL_VertexAttribs1dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLdouble *) (pc + 8) - )); + glVertexAttribs1dvNV(*(GLuint *) (pc + 0), n, (const GLdouble *) (pc + 8)); } void @@ -5388,9 +4761,7 @@ __glXDisp_VertexAttribs1fvNV(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 4); - CALL_VertexAttribs1fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLfloat *) (pc + 8) - )); + glVertexAttribs1fvNV(*(GLuint *) (pc + 0), n, (const GLfloat *) (pc + 8)); } void @@ -5398,9 +4769,7 @@ __glXDisp_VertexAttribs1svNV(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 4); - CALL_VertexAttribs1svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLshort *) (pc + 8) - )); + glVertexAttribs1svNV(*(GLuint *) (pc + 0), n, (const GLshort *) (pc + 8)); } void @@ -5417,9 +4786,7 @@ __glXDisp_VertexAttribs2dvNV(GLbyte * pc) } #endif - CALL_VertexAttribs2dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLdouble *) (pc + 8) - )); + glVertexAttribs2dvNV(*(GLuint *) (pc + 0), n, (const GLdouble *) (pc + 8)); } void @@ -5427,9 +4794,7 @@ __glXDisp_VertexAttribs2fvNV(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 4); - CALL_VertexAttribs2fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLfloat *) (pc + 8) - )); + glVertexAttribs2fvNV(*(GLuint *) (pc + 0), n, (const GLfloat *) (pc + 8)); } void @@ -5437,9 +4802,7 @@ __glXDisp_VertexAttribs2svNV(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 4); - CALL_VertexAttribs2svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLshort *) (pc + 8) - )); + glVertexAttribs2svNV(*(GLuint *) (pc + 0), n, (const GLshort *) (pc + 8)); } void @@ -5456,9 +4819,7 @@ __glXDisp_VertexAttribs3dvNV(GLbyte * pc) } #endif - CALL_VertexAttribs3dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLdouble *) (pc + 8) - )); + glVertexAttribs3dvNV(*(GLuint *) (pc + 0), n, (const GLdouble *) (pc + 8)); } void @@ -5466,9 +4827,7 @@ __glXDisp_VertexAttribs3fvNV(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 4); - CALL_VertexAttribs3fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLfloat *) (pc + 8) - )); + glVertexAttribs3fvNV(*(GLuint *) (pc + 0), n, (const GLfloat *) (pc + 8)); } void @@ -5476,9 +4835,7 @@ __glXDisp_VertexAttribs3svNV(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 4); - CALL_VertexAttribs3svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLshort *) (pc + 8) - )); + glVertexAttribs3svNV(*(GLuint *) (pc + 0), n, (const GLshort *) (pc + 8)); } void @@ -5495,9 +4852,7 @@ __glXDisp_VertexAttribs4dvNV(GLbyte * pc) } #endif - CALL_VertexAttribs4dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLdouble *) (pc + 8) - )); + glVertexAttribs4dvNV(*(GLuint *) (pc + 0), n, (const GLdouble *) (pc + 8)); } void @@ -5505,9 +4860,7 @@ __glXDisp_VertexAttribs4fvNV(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 4); - CALL_VertexAttribs4fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLfloat *) (pc + 8) - )); + glVertexAttribs4fvNV(*(GLuint *) (pc + 0), n, (const GLfloat *) (pc + 8)); } void @@ -5515,9 +4868,7 @@ __glXDisp_VertexAttribs4svNV(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 4); - CALL_VertexAttribs4svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLshort *) (pc + 8) - )); + glVertexAttribs4svNV(*(GLuint *) (pc + 0), n, (const GLshort *) (pc + 8)); } void @@ -5525,402 +4876,11 @@ __glXDisp_VertexAttribs4ubvNV(GLbyte * pc) { const GLsizei n = *(GLsizei *) (pc + 4); - CALL_VertexAttribs4ubvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - n, (const GLubyte *) (pc + 8) - )); -} - -void -__glXDisp_PointParameteriNV(GLbyte * pc) -{ - CALL_PointParameteriNV(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLint *) (pc + 4) - )); -} - -void -__glXDisp_PointParameterivNV(GLbyte * pc) -{ - const GLenum pname = *(GLenum *) (pc + 0); - const GLint *params; - - params = (const GLint *) (pc + 4); - - CALL_PointParameterivNV(GET_DISPATCH(), (pname, params)); + glVertexAttribs4ubvNV(*(GLuint *) (pc + 0), n, (const GLubyte *) (pc + 8)); } void __glXDisp_ActiveStencilFaceEXT(GLbyte * pc) { - CALL_ActiveStencilFaceEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); -} - -int -__glXDisp_GetProgramNamedParameterdvNV(__GLXclientState * cl, GLbyte * pc) -{ - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - const GLsizei len = *(GLsizei *) (pc + 4); - - GLdouble params[4]; - - CALL_GetProgramNamedParameterdvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - len, - (const GLubyte *) (pc - + - 8), - params)); - __glXSendReply(cl->client, params, 4, 8, GL_TRUE, 0); - error = Success; - } - - return error; -} - -int -__glXDisp_GetProgramNamedParameterfvNV(__GLXclientState * cl, GLbyte * pc) -{ - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - const GLsizei len = *(GLsizei *) (pc + 4); - - GLfloat params[4]; - - CALL_GetProgramNamedParameterfvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - len, - (const GLubyte *) (pc - + - 8), - params)); - __glXSendReply(cl->client, params, 4, 4, GL_TRUE, 0); - error = Success; - } - - return error; -} - -void -__glXDisp_ProgramNamedParameter4dvNV(GLbyte * pc) -{ - const GLsizei len = *(GLsizei *) (pc + 36); - -#ifdef __GLX_ALIGN64 - const GLuint cmdlen = 44 + __GLX_PAD(len) - 4; - - if ((unsigned long) (pc) & 7) { - (void) memmove(pc - 4, pc, cmdlen); - pc -= 4; - } -#endif - - CALL_ProgramNamedParameter4dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 32), - len, - (const GLubyte *) (pc + - 40), - (const GLdouble *) (pc + 0) - )); -} - -void -__glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc) -{ - const GLsizei len = *(GLsizei *) (pc + 4); - - CALL_ProgramNamedParameter4fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0), - len, - (const GLubyte *) (pc + - 24), - (const GLfloat *) (pc + 8) - )); -} - -void -__glXDisp_BlendEquationSeparateEXT(GLbyte * pc) -{ - CALL_BlendEquationSeparateEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4) - )); -} - -void -__glXDisp_BindFramebufferEXT(GLbyte * pc) -{ - CALL_BindFramebufferEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4) - )); -} - -void -__glXDisp_BindRenderbufferEXT(GLbyte * pc) -{ - CALL_BindRenderbufferEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLuint *) (pc + 4) - )); -} - -int -__glXDisp_CheckFramebufferStatusEXT(__GLXclientState * cl, GLbyte * pc) -{ - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLenum retval; - - retval = - CALL_CheckFramebufferStatusEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); - __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); - error = Success; - } - - return error; -} - -void -__glXDisp_DeleteFramebuffersEXT(GLbyte * pc) -{ - const GLsizei n = *(GLsizei *) (pc + 0); - - CALL_DeleteFramebuffersEXT(GET_DISPATCH(), (n, (const GLuint *) (pc + 4) - )); -} - -void -__glXDisp_DeleteRenderbuffersEXT(GLbyte * pc) -{ - const GLsizei n = *(GLsizei *) (pc + 0); - - CALL_DeleteRenderbuffersEXT(GET_DISPATCH(), (n, (const GLuint *) (pc + 4) - )); -} - -void -__glXDisp_FramebufferRenderbufferEXT(GLbyte * pc) -{ - CALL_FramebufferRenderbufferEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLuint *) (pc + 12) - )); -} - -void -__glXDisp_FramebufferTexture1DEXT(GLbyte * pc) -{ - CALL_FramebufferTexture1DEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLuint *) (pc + 12), - *(GLint *) (pc + 16) - )); -} - -void -__glXDisp_FramebufferTexture2DEXT(GLbyte * pc) -{ - CALL_FramebufferTexture2DEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLuint *) (pc + 12), - *(GLint *) (pc + 16) - )); -} - -void -__glXDisp_FramebufferTexture3DEXT(GLbyte * pc) -{ - CALL_FramebufferTexture3DEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLenum *) (pc + 8), - *(GLuint *) (pc + 12), - *(GLint *) (pc + 16), - *(GLint *) (pc + 20) - )); -} - -int -__glXDisp_GenFramebuffersEXT(__GLXclientState * cl, GLbyte * pc) -{ - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - const GLsizei n = *(GLsizei *) (pc + 0); - - GLuint answerBuffer[200]; - GLuint *framebuffers = - __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), - 4); - CALL_GenFramebuffersEXT(GET_DISPATCH(), (n, framebuffers)); - __glXSendReply(cl->client, framebuffers, n, 4, GL_TRUE, 0); - error = Success; - } - - return error; -} - -int -__glXDisp_GenRenderbuffersEXT(__GLXclientState * cl, GLbyte * pc) -{ - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - const GLsizei n = *(GLsizei *) (pc + 0); - - GLuint answerBuffer[200]; - GLuint *renderbuffers = - __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), - 4); - CALL_GenRenderbuffersEXT(GET_DISPATCH(), (n, renderbuffers)); - __glXSendReply(cl->client, renderbuffers, n, 4, GL_TRUE, 0); - error = Success; - } - - return error; -} - -void -__glXDisp_GenerateMipmapEXT(GLbyte * pc) -{ - CALL_GenerateMipmapEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0) - )); -} - -int -__glXDisp_GetFramebufferAttachmentParameterivEXT(__GLXclientState * cl, - GLbyte * pc) -{ - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLint params[1]; - - CALL_GetFramebufferAttachmentParameterivEXT(GET_DISPATCH(), - (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLenum *) (pc + 8), - params)); - __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0); - error = Success; - } - - return error; -} - -int -__glXDisp_GetRenderbufferParameterivEXT(__GLXclientState * cl, GLbyte * pc) -{ - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLint params[1]; - - CALL_GetRenderbufferParameterivEXT(GET_DISPATCH(), - (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), params)); - __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0); - error = Success; - } - - return error; -} - -int -__glXDisp_IsFramebufferEXT(__GLXclientState * cl, GLbyte * pc) -{ - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLboolean retval; - - retval = CALL_IsFramebufferEXT(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); - __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); - error = Success; - } - - return error; -} - -int -__glXDisp_IsRenderbufferEXT(__GLXclientState * cl, GLbyte * pc) -{ - xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc; - int error; - __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error); - - pc += __GLX_VENDPRIV_HDR_SIZE; - if (cx != NULL) { - GLboolean retval; - - retval = CALL_IsRenderbufferEXT(GET_DISPATCH(), (*(GLuint *) (pc + 0) - )); - __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval); - error = Success; - } - - return error; -} - -void -__glXDisp_RenderbufferStorageEXT(GLbyte * pc) -{ - CALL_RenderbufferStorageEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLsizei *) (pc + 8), - *(GLsizei *) (pc + 12) - )); -} - -void -__glXDisp_BlitFramebufferEXT(GLbyte * pc) -{ - CALL_BlitFramebufferEXT(GET_DISPATCH(), (*(GLint *) (pc + 0), - *(GLint *) (pc + 4), - *(GLint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLint *) (pc + 16), - *(GLint *) (pc + 20), - *(GLint *) (pc + 24), - *(GLint *) (pc + 28), - *(GLbitfield *) (pc + 32), - *(GLenum *) (pc + 36) - )); -} - -void -__glXDisp_FramebufferTextureLayerEXT(GLbyte * pc) -{ - CALL_FramebufferTextureLayerEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0), - *(GLenum *) (pc + 4), - *(GLuint *) (pc + 8), - *(GLint *) (pc + 12), - *(GLint *) (pc + 16) - )); + glActiveStencilFaceEXT(*(GLenum *) (pc + 0)); } |