Put quotes around the CC and CXX variables passed to mklib. This make

[mesa.git] / src / glx / x11 / single2.c

diff --git a/src/glx/x11/single2.c b/src/glx/x11/single2.c
index 693c28df8fee2d35a115d850efa3958abb9f7682..9279b56845fc662b784b4a153dd530cebdc57b19 100644 (file)
--- a/src/glx/x11/single2.c
+++ b/src/glx/x11/single2.c
@@ -34,7 +34,6 @@
 **
 */
 
-#define NEED_GL_FUNCS_WRAPPED
 #include <stdio.h>
 #include "glxclient.h"
 #include "packsingle.h"
@@ -92,7 +91,28 @@ static void TransposeMatrixi(GLint m[16])
     }
 }
 
-GLenum glGetError(void)
+
+/**
+ * Remap a transpose-matrix enum to a non-transpose-matrix enum.  Enums
+ * that are not transpose-matrix enums are unaffected.
+ */
+static GLenum
+RemapTransposeEnum( GLenum e )
+{
+    switch( e ) {
+    case GL_TRANSPOSE_MODELVIEW_MATRIX:
+    case GL_TRANSPOSE_PROJECTION_MATRIX:
+    case GL_TRANSPOSE_TEXTURE_MATRIX:
+       return e - (GL_TRANSPOSE_MODELVIEW_MATRIX - GL_MODELVIEW_MATRIX);
+    case GL_TRANSPOSE_COLOR_MATRIX:
+       return GL_COLOR_MATRIX;
+    default:
+       return e;
+    };
+}
+
+
+GLenum __indirect_glGetError(void)
 {
     __GLX_SINGLE_DECLARE_VARIABLES();
     GLuint retval = GL_NO_ERROR;
@@ -114,20 +134,6 @@ GLenum glGetError(void)
     return retval;
 }
 
-void glGetClipPlane(GLenum plane, GLdouble *equation)
-{
-    __GLX_SINGLE_DECLARE_VARIABLES();
-    xGLXSingleReply reply;
-    __GLX_SINGLE_LOAD_VARIABLES();
-    __GLX_SINGLE_BEGIN(X_GLsop_GetClipPlane,4);
-    __GLX_SINGLE_PUT_LONG(0,plane);
-    __GLX_SINGLE_READ_XREPLY();
-    if (reply.length == 8) {
-       __GLX_SINGLE_GET_DOUBLE_ARRAY(equation,4);
-    }
-    __GLX_SINGLE_END();
-}
-
 #define CASE_ARRAY_ENABLE(enum_name,array,dest,gl_type) \
     case GL_ ## enum_name ## _ARRAY: \
       *dest = (gl_type) (IS_ARRAY_ENABLED(state, array)); break
@@ -147,25 +153,14 @@ void glGetClipPlane(GLenum plane, GLdouble *equation)
        CASE_ARRAY_TYPE(enum_name,array,dest,gl_type); \
        CASE_ARRAY_SIZE(enum_name,array,dest,gl_type)
 
-void glGetBooleanv(GLenum val, GLboolean *b)
+void __indirect_glGetBooleanv(GLenum val, GLboolean *b)
 {
     const GLenum origVal = val;
     __GLX_SINGLE_DECLARE_VARIABLES();
     __GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
     xGLXSingleReply reply;
 
-    if (val == GL_TRANSPOSE_MODELVIEW_MATRIX_ARB) {
-       val = GL_MODELVIEW_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_PROJECTION_MATRIX_ARB) {
-       val = GL_PROJECTION_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_TEXTURE_MATRIX_ARB) {
-       val = GL_TEXTURE_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_COLOR_MATRIX_ARB) {
-       val = GL_COLOR_MATRIX;
-    }
+    val = RemapTransposeEnum( val );
 
     __GLX_SINGLE_LOAD_VARIABLES();
     __GLX_SINGLE_BEGIN(X_GLsop_GetBooleanv,4);
@@ -299,25 +294,14 @@ void glGetBooleanv(GLenum val, GLboolean *b)
     __GLX_SINGLE_END();
 }
 
-void glGetDoublev(GLenum val, GLdouble *d)
+void __indirect_glGetDoublev(GLenum val, GLdouble *d)
 {
     const GLenum origVal = val;
     __GLX_SINGLE_DECLARE_VARIABLES();
     __GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
     xGLXSingleReply reply;
 
-    if (val == GL_TRANSPOSE_MODELVIEW_MATRIX_ARB) {
-       val = GL_MODELVIEW_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_PROJECTION_MATRIX_ARB) {
-       val = GL_PROJECTION_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_TEXTURE_MATRIX_ARB) {
-       val = GL_TEXTURE_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_COLOR_MATRIX_ARB) {
-       val = GL_COLOR_MATRIX;
-    }
+    val = RemapTransposeEnum( val );
 
     __GLX_SINGLE_LOAD_VARIABLES();
     __GLX_SINGLE_BEGIN(X_GLsop_GetDoublev,4);
@@ -451,25 +435,14 @@ void glGetDoublev(GLenum val, GLdouble *d)
     __GLX_SINGLE_END();
 }
 
-void glGetFloatv(GLenum val, GLfloat *f)
+void __indirect_glGetFloatv(GLenum val, GLfloat *f)
 {
     const GLenum origVal = val;
     __GLX_SINGLE_DECLARE_VARIABLES();
     __GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
     xGLXSingleReply reply;
 
-    if (val == GL_TRANSPOSE_MODELVIEW_MATRIX_ARB) {
-       val = GL_MODELVIEW_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_PROJECTION_MATRIX_ARB) {
-       val = GL_PROJECTION_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_TEXTURE_MATRIX_ARB) {
-       val = GL_TEXTURE_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_COLOR_MATRIX_ARB) {
-       val = GL_COLOR_MATRIX;
-    }
+    val = RemapTransposeEnum( val );
 
     __GLX_SINGLE_LOAD_VARIABLES();
     __GLX_SINGLE_BEGIN(X_GLsop_GetFloatv,4);
@@ -603,25 +576,14 @@ void glGetFloatv(GLenum val, GLfloat *f)
     __GLX_SINGLE_END();
 }
 
-void glGetIntegerv(GLenum val, GLint *i)
+void __indirect_glGetIntegerv(GLenum val, GLint *i)
 {
     const GLenum origVal = val;
     __GLX_SINGLE_DECLARE_VARIABLES();
     __GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
     xGLXSingleReply reply;
 
-    if (val == GL_TRANSPOSE_MODELVIEW_MATRIX_ARB) {
-       val = GL_MODELVIEW_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_PROJECTION_MATRIX_ARB) {
-       val = GL_PROJECTION_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_TEXTURE_MATRIX_ARB) {
-       val = GL_TEXTURE_MATRIX;
-    }
-    else if (val == GL_TRANSPOSE_COLOR_MATRIX_ARB) {
-       val = GL_COLOR_MATRIX;
-    }
+    val = RemapTransposeEnum( val );
 
     __GLX_SINGLE_LOAD_VARIABLES();
     __GLX_SINGLE_BEGIN(X_GLsop_GetIntegerv,4);
@@ -758,7 +720,7 @@ void glGetIntegerv(GLenum val, GLint *i)
 /*
 ** Send all pending commands to server.
 */
-void glFlush(void)
+void __indirect_glFlush(void)
 {
     __GLX_SINGLE_DECLARE_VARIABLES();
 
@@ -772,7 +734,7 @@ void glFlush(void)
     XFlush(dpy);
 }
 
-void glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
+void __indirect_glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
     __GLX_SINGLE_DECLARE_VARIABLES();
 
@@ -787,7 +749,7 @@ void glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
     gc->feedbackBuf = buffer;
 }
 
-void glSelectBuffer(GLsizei numnames, GLuint *buffer)
+void __indirect_glSelectBuffer(GLsizei numnames, GLuint *buffer)
 {
     __GLX_SINGLE_DECLARE_VARIABLES();
 
@@ -801,7 +763,7 @@ void glSelectBuffer(GLsizei numnames, GLuint *buffer)
     gc->selectBuf = buffer;
 }
 
-GLint glRenderMode(GLenum mode)
+GLint __indirect_glRenderMode(GLenum mode)
 {
     __GLX_SINGLE_DECLARE_VARIABLES();
     GLint retval = 0;
@@ -838,7 +800,7 @@ GLint glRenderMode(GLenum mode)
     return retval;
 }
 
-void glFinish(void)
+void __indirect_glFinish(void)
 {
     __GLX_SINGLE_DECLARE_VARIABLES();
     xGLXSingleReply reply;
@@ -868,7 +830,7 @@ version_from_string( const char * ver,
 }
 
 
-const GLubyte *glGetString(GLenum name)
+const GLubyte *__indirect_glGetString(GLenum name)
 {
     __GLXcontext *gc = __glXGetCurrentContext();
     Display *dpy = gc->currentDpy;
@@ -1013,7 +975,7 @@ const GLubyte *glGetString(GLenum name)
     return s;
 }
 
-GLboolean glIsEnabled(GLenum cap)
+GLboolean __indirect_glIsEnabled(GLenum cap)
 {
     __GLX_SINGLE_DECLARE_VARIABLES();
     __GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -1050,7 +1012,7 @@ GLboolean glIsEnabled(GLenum cap)
     return retval;
 }
 
-void glGetPointerv(GLenum pname, void **params)
+void __indirect_glGetPointerv(GLenum pname, void **params)
 {
     __GLXcontext *gc = __glXGetCurrentContext();
     __GLXattribute * state = (__GLXattribute *)(gc->client_state_private);