brkho
/
mesa
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Julkaisut 562 Wiki Activity
Selaa lähdekoodia

Make the transition to script-genereated GLX code easier. 

Eliminate the need for indirect_wrap.h and NEED_GL_FUNCS_WRAPPED.
Basically, this means prepending __indirect_ to all the definitions and
calls of GL functions that don't already have it.
tags/unichrome-last-xinerama
Ian Romanick 21 vuotta sitten
vanhempi
249a5552f1
commit
345ed3ac8c
15 muutettua tiedostoa jossa 188 lisäystä ja 924 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 4
    5
      src/glx/x11/clientattrib.c
  2. 1
    0
      src/glx/x11/g_render.c
  3. 41
    40
      src/glx/x11/g_single.c
  4. 4
    4
      src/glx/x11/g_vendpriv.c
  5. 0
    3
      src/glx/x11/glxclient.h
  6. 12
    13
      src/glx/x11/indirect.h
  7. 22
    22
      src/glx/x11/indirect_init.c
  8. 0
    730
      src/glx/x11/indirect_wrap.h
  9. 0
    1
      src/glx/x11/packrender.h
  10. 2
    4
      src/glx/x11/pixelstore.c
  11. 16
    15
      src/glx/x11/render2.c
  12. 14
    14
      src/glx/x11/renderpix.c
  13. 14
    15
      src/glx/x11/single2.c
  14. 8
    8
      src/glx/x11/singlepix.c
  15. 50
    50
      src/glx/x11/vertarr.c

+ 4
- 5
src/glx/x11/clientattrib.c Näytä tiedosto

@@ -35,12 +35,11 @@
*/

#include <assert.h>
#define NEED_GL_FUNCS_WRAPPED
#include "glxclient.h"

/*****************************************************************************/

void glEnableClientState(GLenum array)
void __indirect_glEnableClientState(GLenum array)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -75,7 +74,7 @@ void glEnableClientState(GLenum array)
}
}

void glDisableClientState(GLenum array)
void __indirect_glDisableClientState(GLenum array)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -112,7 +111,7 @@ void glDisableClientState(GLenum array)

/************************************************************************/

void glPushClientAttrib(GLuint mask)
void __indirect_glPushClientAttrib(GLuint mask)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -138,7 +137,7 @@ void glPushClientAttrib(GLuint mask)
}
}

void glPopClientAttrib(void)
void __indirect_glPopClientAttrib(void)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);

+ 1
- 0
src/glx/x11/g_render.c Näytä tiedosto

@@ -30,6 +30,7 @@

#include "packrender.h"
#include "size.h"
#include "indirect.h"

#define GLdouble_SIZE 8
#define GLclampd_SIZE 8

+ 41
- 40
src/glx/x11/g_single.c Näytä tiedosto

@@ -29,8 +29,9 @@
*/

#include "packsingle.h"
#include "indirect.h"

void glNewList(GLuint list, GLenum mode)
void __indirect_glNewList(GLuint list, GLenum mode)
{
__GLX_SINGLE_DECLARE_VARIABLES();
__GLX_SINGLE_LOAD_VARIABLES();
@@ -40,7 +41,7 @@ void glNewList(GLuint list, GLenum mode)
__GLX_SINGLE_END();
}

void glEndList(void)
void __indirect_glEndList(void)
{
__GLX_SINGLE_DECLARE_VARIABLES();
__GLX_SINGLE_LOAD_VARIABLES();
@@ -48,7 +49,7 @@ void glEndList(void)
__GLX_SINGLE_END();
}

void glDeleteLists(GLuint list, GLsizei range)
void __indirect_glDeleteLists(GLuint list, GLsizei range)
{
__GLX_SINGLE_DECLARE_VARIABLES();
__GLX_SINGLE_LOAD_VARIABLES();
@@ -58,7 +59,7 @@ void glDeleteLists(GLuint list, GLsizei range)
__GLX_SINGLE_END();
}

GLuint glGenLists(GLsizei range)
GLuint __indirect_glGenLists(GLsizei range)
{
__GLX_SINGLE_DECLARE_VARIABLES();
GLuint retval = 0;
@@ -72,7 +73,7 @@ GLuint glGenLists(GLsizei range)
return retval;
}

void glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
void __indirect_glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -90,7 +91,7 @@ void glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
__GLX_SINGLE_END();
}

void glGetLightiv(GLenum light, GLenum pname, GLint *params)
void __indirect_glGetLightiv(GLenum light, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -108,7 +109,7 @@ void glGetLightiv(GLenum light, GLenum pname, GLint *params)
__GLX_SINGLE_END();
}

void glGetMapdv(GLenum target, GLenum query, GLdouble *v)
void __indirect_glGetMapdv(GLenum target, GLenum query, GLdouble *v)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -126,7 +127,7 @@ void glGetMapdv(GLenum target, GLenum query, GLdouble *v)
__GLX_SINGLE_END();
}

void glGetMapfv(GLenum target, GLenum query, GLfloat *v)
void __indirect_glGetMapfv(GLenum target, GLenum query, GLfloat *v)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -144,7 +145,7 @@ void glGetMapfv(GLenum target, GLenum query, GLfloat *v)
__GLX_SINGLE_END();
}

void glGetMapiv(GLenum target, GLenum query, GLint *v)
void __indirect_glGetMapiv(GLenum target, GLenum query, GLint *v)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -162,7 +163,7 @@ void glGetMapiv(GLenum target, GLenum query, GLint *v)
__GLX_SINGLE_END();
}

void glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
void __indirect_glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -180,7 +181,7 @@ void glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
__GLX_SINGLE_END();
}

void glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
void __indirect_glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -198,7 +199,7 @@ void glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
__GLX_SINGLE_END();
}

void glGetPixelMapfv(GLenum map, GLfloat *values)
void __indirect_glGetPixelMapfv(GLenum map, GLfloat *values)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -215,7 +216,7 @@ void glGetPixelMapfv(GLenum map, GLfloat *values)
__GLX_SINGLE_END();
}

void glGetPixelMapuiv(GLenum map, GLuint *values)
void __indirect_glGetPixelMapuiv(GLenum map, GLuint *values)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -232,7 +233,7 @@ void glGetPixelMapuiv(GLenum map, GLuint *values)
__GLX_SINGLE_END();
}

void glGetPixelMapusv(GLenum map, GLushort *values)
void __indirect_glGetPixelMapusv(GLenum map, GLushort *values)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -249,7 +250,7 @@ void glGetPixelMapusv(GLenum map, GLushort *values)
__GLX_SINGLE_END();
}

void glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
void __indirect_glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -267,7 +268,7 @@ void glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
__GLX_SINGLE_END();
}

void glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
void __indirect_glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -285,7 +286,7 @@ void glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
__GLX_SINGLE_END();
}

void glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
void __indirect_glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -303,7 +304,7 @@ void glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
__GLX_SINGLE_END();
}

void glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
void __indirect_glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -321,7 +322,7 @@ void glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
__GLX_SINGLE_END();
}

void glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
void __indirect_glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -339,7 +340,7 @@ void glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
__GLX_SINGLE_END();
}

void glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
void __indirect_glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -357,7 +358,7 @@ void glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
__GLX_SINGLE_END();
}

void glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
void __indirect_glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -375,7 +376,7 @@ void glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
__GLX_SINGLE_END();
}

void glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
void __indirect_glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -394,7 +395,7 @@ void glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat
__GLX_SINGLE_END();
}

void glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
void __indirect_glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -413,7 +414,7 @@ void glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *p
__GLX_SINGLE_END();
}

GLboolean glIsList(GLuint list)
GLboolean __indirect_glIsList(GLuint list)
{
__GLX_SINGLE_DECLARE_VARIABLES();
GLboolean retval = 0;
@@ -445,7 +446,7 @@ GLboolean glIsList(GLuint list)
* transition path.
*/

GLboolean glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
GLboolean __indirect_glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
{
#if 0 /* see comments above */
__GLX_SINGLE_DECLARE_VARIABLES();
@@ -463,11 +464,11 @@ GLboolean glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *re
__GLX_SINGLE_END();
return retval;
#else
return glAreTexturesResidentEXT(n, textures, residences);
return __indirect_glAreTexturesResidentEXT(n, textures, residences);
#endif
}

void glDeleteTextures(GLsizei n, const GLuint *textures)
void __indirect_glDeleteTextures(GLsizei n, const GLuint *textures)
{
#if 0 /* see comments above */
__GLX_SINGLE_DECLARE_VARIABLES();
@@ -479,11 +480,11 @@ void glDeleteTextures(GLsizei n, const GLuint *textures)
__GLX_PUT_LONG_ARRAY(4,textures,n);
__GLX_SINGLE_END();
#else
glDeleteTexturesEXT(n, textures);
__indirect_glDeleteTexturesEXT(n, textures);
#endif
}

void glGenTextures(GLsizei n, GLuint *textures)
void __indirect_glGenTextures(GLsizei n, GLuint *textures)
{
#if 0 /* see comments above */
__GLX_SINGLE_DECLARE_VARIABLES();
@@ -495,11 +496,11 @@ void glGenTextures(GLsizei n, GLuint *textures)
__GLX_SINGLE_GET_LONG_ARRAY(textures,n);
__GLX_SINGLE_END();
#else
glGenTexturesEXT(n, textures);
__indirect_glGenTexturesEXT(n, textures);
#endif
}

GLboolean glIsTexture(GLuint texture)
GLboolean __indirect_glIsTexture(GLuint texture)
{
#if 0 /* see comments above */
__GLX_SINGLE_DECLARE_VARIABLES();
@@ -513,11 +514,11 @@ GLboolean glIsTexture(GLuint texture)
__GLX_SINGLE_END();
return retval;
#else
return glIsTextureEXT(texture);
return __indirect_glIsTextureEXT(texture);
#endif
}

void glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
void __indirect_glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -535,7 +536,7 @@ void glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
__GLX_SINGLE_END();
}

void glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
void __indirect_glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -553,7 +554,7 @@ void glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
__GLX_SINGLE_END();
}

void glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
void __indirect_glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -571,7 +572,7 @@ void glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
__GLX_SINGLE_END();
}

void glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
void __indirect_glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -589,7 +590,7 @@ void glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
__GLX_SINGLE_END();
}

void glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
void __indirect_glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -607,7 +608,7 @@ void glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
__GLX_SINGLE_END();
}

void glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
void __indirect_glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -625,7 +626,7 @@ void glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
__GLX_SINGLE_END();
}

void glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
void __indirect_glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -643,7 +644,7 @@ void glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
__GLX_SINGLE_END();
}

void glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
void __indirect_glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;

+ 4
- 4
src/glx/x11/g_vendpriv.c Näytä tiedosto

@@ -30,7 +30,7 @@

#include "packvendpriv.h"

GLboolean glAreTexturesResidentEXT(GLsizei n, const GLuint *textures, GLboolean *residences)
GLboolean __indirect_glAreTexturesResidentEXT(GLsizei n, const GLuint *textures, GLboolean *residences)
{
__GLX_VENDPRIV_DECLARE_VARIABLES();
GLboolean retval = 0;
@@ -48,7 +48,7 @@ GLboolean glAreTexturesResidentEXT(GLsizei n, const GLuint *textures, GLboolean
return retval;
}

void glDeleteTexturesEXT(GLsizei n, const GLuint *textures)
void __indirect_glDeleteTexturesEXT(GLsizei n, const GLuint *textures)
{
__GLX_VENDPRIV_DECLARE_VARIABLES();
__GLX_VENDPRIV_LOAD_VARIABLES();
@@ -60,7 +60,7 @@ void glDeleteTexturesEXT(GLsizei n, const GLuint *textures)
__GLX_VENDPRIV_END();
}

void glGenTexturesEXT(GLsizei n, GLuint *textures)
void __indirect_glGenTexturesEXT(GLsizei n, GLuint *textures)
{
__GLX_VENDPRIV_DECLARE_VARIABLES();
xGLXVendorPrivReply reply;
@@ -72,7 +72,7 @@ void glGenTexturesEXT(GLsizei n, GLuint *textures)
__GLX_VENDPRIV_END();
}

GLboolean glIsTextureEXT(GLuint texture)
GLboolean __indirect_glIsTextureEXT(GLuint texture)
{
__GLX_VENDPRIV_DECLARE_VARIABLES();
GLboolean retval = 0;

+ 0
- 3
src/glx/x11/glxclient.h Näytä tiedosto

@@ -59,9 +59,6 @@
#include "GL/glxproto.h"
#include "GL/internal/glcore.h"
#include "glapitable.h"
#ifdef NEED_GL_FUNCS_WRAPPED
#include "indirect.h"
#endif
#ifdef XTHREADS
#include "Xthreads.h"
#endif

+ 12
- 13
src/glx/x11/indirect.h Näytä tiedosto

@@ -40,7 +40,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# endif

# define _INDIRECT_H_
# include "indirect_wrap.h"

# define glxproto_void(name, rop) \
extern void __indirect_gl ## name ( void );
@@ -181,17 +180,17 @@ glxproto_4(Color4ui, X_GLrop_Color4uiv, GLuint)
glxproto_4(Color4f, X_GLrop_Color4fv, GLfloat)
glxproto_4(Color4d, X_GLrop_Color4dv, GLdouble)

glxproto_1(FogCoordf, X_GLrop_FogCoordfv, GLfloat)
glxproto_1(FogCoordd, X_GLrop_FogCoorddv, GLdouble)
glxvendr_1(FogCoordf, X_GLrop_FogCoordfv, GLfloat, EXT)
glxvendr_1(FogCoordd, X_GLrop_FogCoorddv, GLdouble, EXT)

glxproto_3(SecondaryColor3b, X_GLrop_SecondaryColor3bv, GLbyte)
glxproto_3(SecondaryColor3s, X_GLrop_SecondaryColor3sv, GLshort)
glxproto_3(SecondaryColor3i, X_GLrop_SecondaryColor3iv, GLint)
glxproto_3(SecondaryColor3ub, X_GLrop_SecondaryColor3ubv, GLubyte)
glxproto_3(SecondaryColor3us, X_GLrop_SecondaryColor3usv, GLushort)
glxproto_3(SecondaryColor3ui, X_GLrop_SecondaryColor3uiv, GLuint)
glxproto_3(SecondaryColor3f, X_GLrop_SecondaryColor3fv, GLfloat)
glxproto_3(SecondaryColor3d, X_GLrop_SecondaryColor3dv, GLdouble)
glxvendr_3(SecondaryColor3b, X_GLrop_SecondaryColor3bv, GLbyte, EXT)
glxvendr_3(SecondaryColor3s, X_GLrop_SecondaryColor3sv, GLshort, EXT)
glxvendr_3(SecondaryColor3i, X_GLrop_SecondaryColor3iv, GLint, EXT)
glxvendr_3(SecondaryColor3ub, X_GLrop_SecondaryColor3ubv, GLubyte, EXT)
glxvendr_3(SecondaryColor3us, X_GLrop_SecondaryColor3usv, GLushort, EXT)
glxvendr_3(SecondaryColor3ui, X_GLrop_SecondaryColor3uiv, GLuint, EXT)
glxvendr_3(SecondaryColor3f, X_GLrop_SecondaryColor3fv, GLfloat, EXT)
glxvendr_3(SecondaryColor3d, X_GLrop_SecondaryColor3dv, GLdouble, EXT)

glxproto_1(EdgeFlag, X_GLrop_EdgeFlagv, GLboolean)

@@ -598,11 +597,11 @@ void __indirect_glCompressedTexSubImage3DARB( GLenum target, GLint level,

/* 145. GL_EXT_secondary_color / GL 1.4 */

void __indirect_glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
void __indirect_glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);

/* 149. GL_EXT_fog_coord / GL 1.4 */

void __indirect_glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
void __indirect_glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);

# undef glxproto_void
# undef glxproto_Cv

+ 22
- 22
src/glx/x11/indirect_init.c Näytä tiedosto

@@ -585,30 +585,30 @@ __GLapi *__glXNewIndirectAPI(void)
glAPI->VertexPointerEXT = VertexPointerEXT;

/* 145. GL_EXT_secondary_color / GL 1.4 */
glAPI->SecondaryColor3bEXT = __indirect_glSecondaryColor3b;
glAPI->SecondaryColor3bvEXT = __indirect_glSecondaryColor3bv;
glAPI->SecondaryColor3sEXT = __indirect_glSecondaryColor3s;
glAPI->SecondaryColor3svEXT = __indirect_glSecondaryColor3sv;
glAPI->SecondaryColor3iEXT = __indirect_glSecondaryColor3i;
glAPI->SecondaryColor3ivEXT = __indirect_glSecondaryColor3iv;
glAPI->SecondaryColor3ubEXT = __indirect_glSecondaryColor3ub;
glAPI->SecondaryColor3ubvEXT = __indirect_glSecondaryColor3ubv;
glAPI->SecondaryColor3usEXT = __indirect_glSecondaryColor3us;
glAPI->SecondaryColor3usvEXT = __indirect_glSecondaryColor3usv;
glAPI->SecondaryColor3uiEXT = __indirect_glSecondaryColor3ui;
glAPI->SecondaryColor3uivEXT = __indirect_glSecondaryColor3uiv;
glAPI->SecondaryColor3fEXT = __indirect_glSecondaryColor3f;
glAPI->SecondaryColor3fvEXT = __indirect_glSecondaryColor3fv;
glAPI->SecondaryColor3dEXT = __indirect_glSecondaryColor3d;
glAPI->SecondaryColor3dvEXT = __indirect_glSecondaryColor3dv;
glAPI->SecondaryColorPointerEXT = __indirect_glSecondaryColorPointer;
glAPI->SecondaryColor3bEXT = __indirect_glSecondaryColor3bEXT;
glAPI->SecondaryColor3bvEXT = __indirect_glSecondaryColor3bvEXT;
glAPI->SecondaryColor3sEXT = __indirect_glSecondaryColor3sEXT;
glAPI->SecondaryColor3svEXT = __indirect_glSecondaryColor3svEXT;
glAPI->SecondaryColor3iEXT = __indirect_glSecondaryColor3iEXT;
glAPI->SecondaryColor3ivEXT = __indirect_glSecondaryColor3ivEXT;
glAPI->SecondaryColor3ubEXT = __indirect_glSecondaryColor3ubEXT;
glAPI->SecondaryColor3ubvEXT = __indirect_glSecondaryColor3ubvEXT;
glAPI->SecondaryColor3usEXT = __indirect_glSecondaryColor3usEXT;
glAPI->SecondaryColor3usvEXT = __indirect_glSecondaryColor3usvEXT;
glAPI->SecondaryColor3uiEXT = __indirect_glSecondaryColor3uiEXT;
glAPI->SecondaryColor3uivEXT = __indirect_glSecondaryColor3uivEXT;
glAPI->SecondaryColor3fEXT = __indirect_glSecondaryColor3fEXT;
glAPI->SecondaryColor3fvEXT = __indirect_glSecondaryColor3fvEXT;
glAPI->SecondaryColor3dEXT = __indirect_glSecondaryColor3dEXT;
glAPI->SecondaryColor3dvEXT = __indirect_glSecondaryColor3dvEXT;
glAPI->SecondaryColorPointerEXT = __indirect_glSecondaryColorPointerEXT;

/* 149. GL_EXT_fog_coord / GL 1.4 */
glAPI->FogCoordfEXT = __indirect_glFogCoordf;
glAPI->FogCoordfvEXT = __indirect_glFogCoordfv;
glAPI->FogCoorddEXT = __indirect_glFogCoordd;
glAPI->FogCoorddvEXT = __indirect_glFogCoorddv;
glAPI->FogCoordPointerEXT = __indirect_glFogCoordPointer;
glAPI->FogCoordfEXT = __indirect_glFogCoordfEXT;
glAPI->FogCoordfvEXT = __indirect_glFogCoordfvEXT;
glAPI->FogCoorddEXT = __indirect_glFogCoorddEXT;
glAPI->FogCoorddvEXT = __indirect_glFogCoorddvEXT;
glAPI->FogCoordPointerEXT = __indirect_glFogCoordPointerEXT;

/* 173. GL_EXT_blend_func_separate / GL 1.4 */
glAPI->BlendFuncSeparateEXT = __indirect_glBlendFuncSeparate;

+ 0
- 730
src/glx/x11/indirect_wrap.h Näytä tiedosto

@@ -1,730 +0,0 @@
/* $XFree86: xc/lib/GL/glx/indirect_wrap.h,v 1.4 2003/09/28 20:15:04 alanh Exp $ */
/**************************************************************************

Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
All Rights Reserved.

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sub license, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice (including the
next paragraph) shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

**************************************************************************/

/*
* Authors:
* Kevin E. Martin <kevin@precisioninsight.com>
*
*/

/* NOTE: This file could be automatically generated */

#ifndef _INDIRECT_WRAP_H_
#define _INDIRECT_WRAP_H_

#define glAccum __indirect_glAccum
#define glAlphaFunc __indirect_glAlphaFunc
#define glAreTexturesResident __indirect_glAreTexturesResident
#define glArrayElement __indirect_glArrayElement
#define glBegin __indirect_glBegin
#define glBindTexture __indirect_glBindTexture
#define glBitmap __indirect_glBitmap
#define glBlendFunc __indirect_glBlendFunc
#define glCallList __indirect_glCallList
#define glCallLists __indirect_glCallLists
#define glClear __indirect_glClear
#define glClearAccum __indirect_glClearAccum
#define glClearColor __indirect_glClearColor
#define glClearDepth __indirect_glClearDepth
#define glClearIndex __indirect_glClearIndex
#define glClearStencil __indirect_glClearStencil
#define glClipPlane __indirect_glClipPlane
#define glColor3b __indirect_glColor3b
#define glColor3bv __indirect_glColor3bv
#define glColor3d __indirect_glColor3d
#define glColor3dv __indirect_glColor3dv
#define glColor3f __indirect_glColor3f
#define glColor3fv __indirect_glColor3fv
#define glColor3i __indirect_glColor3i
#define glColor3iv __indirect_glColor3iv
#define glColor3s __indirect_glColor3s
#define glColor3sv __indirect_glColor3sv
#define glColor3ub __indirect_glColor3ub
#define glColor3ubv __indirect_glColor3ubv
#define glColor3ui __indirect_glColor3ui
#define glColor3uiv __indirect_glColor3uiv
#define glColor3us __indirect_glColor3us
#define glColor3usv __indirect_glColor3usv
#define glColor4b __indirect_glColor4b
#define glColor4bv __indirect_glColor4bv
#define glColor4d __indirect_glColor4d
#define glColor4dv __indirect_glColor4dv
#define glColor4f __indirect_glColor4f
#define glColor4fv __indirect_glColor4fv
#define glColor4i __indirect_glColor4i
#define glColor4iv __indirect_glColor4iv
#define glColor4s __indirect_glColor4s
#define glColor4sv __indirect_glColor4sv
#define glColor4ub __indirect_glColor4ub
#define glColor4ubv __indirect_glColor4ubv
#define glColor4ui __indirect_glColor4ui
#define glColor4uiv __indirect_glColor4uiv
#define glColor4us __indirect_glColor4us
#define glColor4usv __indirect_glColor4usv
#define glColorMask __indirect_glColorMask
#define glColorMaterial __indirect_glColorMaterial
#define glColorPointer __indirect_glColorPointer
#define glCopyPixels __indirect_glCopyPixels
#define glCopyTexImage1D __indirect_glCopyTexImage1D
#define glCopyTexImage2D __indirect_glCopyTexImage2D
#define glCopyTexSubImage1D __indirect_glCopyTexSubImage1D
#define glCopyTexSubImage2D __indirect_glCopyTexSubImage2D
#define glCullFace __indirect_glCullFace
#define glDeleteLists __indirect_glDeleteLists
#define glDeleteTextures __indirect_glDeleteTextures
#define glDepthFunc __indirect_glDepthFunc
#define glDepthMask __indirect_glDepthMask
#define glDepthRange __indirect_glDepthRange
#define glDisable __indirect_glDisable
#define glDisableClientState __indirect_glDisableClientState
#define glDrawArrays __indirect_glDrawArrays
#define glDrawBuffer __indirect_glDrawBuffer
#define glDrawElements __indirect_glDrawElements
#define glDrawPixels __indirect_glDrawPixels
#define glEdgeFlag __indirect_glEdgeFlag
#define glEdgeFlagPointer __indirect_glEdgeFlagPointer
#define glEdgeFlagv __indirect_glEdgeFlagv
#define glEnable __indirect_glEnable
#define glEnableClientState __indirect_glEnableClientState
#define glEnd __indirect_glEnd
#define glEndList __indirect_glEndList
#define glEvalCoord1d __indirect_glEvalCoord1d
#define glEvalCoord1dv __indirect_glEvalCoord1dv
#define glEvalCoord1f __indirect_glEvalCoord1f
#define glEvalCoord1fv __indirect_glEvalCoord1fv
#define glEvalCoord2d __indirect_glEvalCoord2d
#define glEvalCoord2dv __indirect_glEvalCoord2dv
#define glEvalCoord2f __indirect_glEvalCoord2f
#define glEvalCoord2fv __indirect_glEvalCoord2fv
#define glEvalMesh1 __indirect_glEvalMesh1
#define glEvalMesh2 __indirect_glEvalMesh2
#define glEvalPoint1 __indirect_glEvalPoint1
#define glEvalPoint2 __indirect_glEvalPoint2
#define glFeedbackBuffer __indirect_glFeedbackBuffer
#define glFinish __indirect_glFinish
#define glFlush __indirect_glFlush
#define glFogf __indirect_glFogf
#define glFogfv __indirect_glFogfv
#define glFogi __indirect_glFogi
#define glFogiv __indirect_glFogiv
#define glFrontFace __indirect_glFrontFace
#define glFrustum __indirect_glFrustum
#define glGenLists __indirect_glGenLists
#define glGenTextures __indirect_glGenTextures
#define glGetBooleanv __indirect_glGetBooleanv
#define glGetClipPlane __indirect_glGetClipPlane
#define glGetDoublev __indirect_glGetDoublev
#define glGetError __indirect_glGetError
#define glGetFloatv __indirect_glGetFloatv
#define glGetIntegerv __indirect_glGetIntegerv
#define glGetLightfv __indirect_glGetLightfv
#define glGetLightiv __indirect_glGetLightiv
#define glGetMapdv __indirect_glGetMapdv
#define glGetMapfv __indirect_glGetMapfv
#define glGetMapiv __indirect_glGetMapiv
#define glGetMaterialfv __indirect_glGetMaterialfv
#define glGetMaterialiv __indirect_glGetMaterialiv
#define glGetPixelMapfv __indirect_glGetPixelMapfv
#define glGetPixelMapuiv __indirect_glGetPixelMapuiv
#define glGetPixelMapusv __indirect_glGetPixelMapusv
#define glGetPointerv __indirect_glGetPointerv
#define glGetPolygonStipple __indirect_glGetPolygonStipple
#define glGetString __indirect_glGetString
#define glGetTexEnvfv __indirect_glGetTexEnvfv
#define glGetTexEnviv __indirect_glGetTexEnviv
#define glGetTexGendv __indirect_glGetTexGendv
#define glGetTexGenfv __indirect_glGetTexGenfv
#define glGetTexGeniv __indirect_glGetTexGeniv
#define glGetTexImage __indirect_glGetTexImage
#define glGetTexLevelParameterfv __indirect_glGetTexLevelParameterfv
#define glGetTexLevelParameteriv __indirect_glGetTexLevelParameteriv
#define glGetTexParameterfv __indirect_glGetTexParameterfv
#define glGetTexParameteriv __indirect_glGetTexParameteriv
#define glHint __indirect_glHint
#define glIndexMask __indirect_glIndexMask
#define glIndexPointer __indirect_glIndexPointer
#define glIndexd __indirect_glIndexd
#define glIndexdv __indirect_glIndexdv
#define glIndexf __indirect_glIndexf
#define glIndexfv __indirect_glIndexfv
#define glIndexi __indirect_glIndexi
#define glIndexiv __indirect_glIndexiv
#define glIndexs __indirect_glIndexs
#define glIndexsv __indirect_glIndexsv
#define glIndexub __indirect_glIndexub
#define glIndexubv __indirect_glIndexubv
#define glInitNames __indirect_glInitNames
#define glInterleavedArrays __indirect_glInterleavedArrays
#define glIsEnabled __indirect_glIsEnabled
#define glIsList __indirect_glIsList
#define glIsTexture __indirect_glIsTexture
#define glLightModelf __indirect_glLightModelf
#define glLightModelfv __indirect_glLightModelfv
#define glLightModeli __indirect_glLightModeli
#define glLightModeliv __indirect_glLightModeliv
#define glLightf __indirect_glLightf
#define glLightfv __indirect_glLightfv
#define glLighti __indirect_glLighti
#define glLightiv __indirect_glLightiv
#define glLineStipple __indirect_glLineStipple
#define glLineWidth __indirect_glLineWidth
#define glListBase __indirect_glListBase
#define glLoadIdentity __indirect_glLoadIdentity
#define glLoadMatrixd __indirect_glLoadMatrixd
#define glLoadMatrixf __indirect_glLoadMatrixf
#define glLoadName __indirect_glLoadName
#define glLogicOp __indirect_glLogicOp
#define glMap1d __indirect_glMap1d
#define glMap1f __indirect_glMap1f
#define glMap2d __indirect_glMap2d
#define glMap2f __indirect_glMap2f
#define glMapGrid1d __indirect_glMapGrid1d
#define glMapGrid1f __indirect_glMapGrid1f
#define glMapGrid2d __indirect_glMapGrid2d
#define glMapGrid2f __indirect_glMapGrid2f
#define glMaterialf __indirect_glMaterialf
#define glMaterialfv __indirect_glMaterialfv
#define glMateriali __indirect_glMateriali
#define glMaterialiv __indirect_glMaterialiv
#define glMatrixMode __indirect_glMatrixMode
#define glMultMatrixd __indirect_glMultMatrixd
#define glMultMatrixf __indirect_glMultMatrixf
#define glNewList __indirect_glNewList
#define glNormal3b __indirect_glNormal3b
#define glNormal3bv __indirect_glNormal3bv
#define glNormal3d __indirect_glNormal3d
#define glNormal3dv __indirect_glNormal3dv
#define glNormal3f __indirect_glNormal3f
#define glNormal3fv __indirect_glNormal3fv
#define glNormal3i __indirect_glNormal3i
#define glNormal3iv __indirect_glNormal3iv
#define glNormal3s __indirect_glNormal3s
#define glNormal3sv __indirect_glNormal3sv
#define glNormalPointer __indirect_glNormalPointer
#define glOrtho __indirect_glOrtho
#define glPassThrough __indirect_glPassThrough
#define glPixelMapfv __indirect_glPixelMapfv
#define glPixelMapuiv __indirect_glPixelMapuiv
#define glPixelMapusv __indirect_glPixelMapusv
#define glPixelStoref __indirect_glPixelStoref
#define glPixelStorei __indirect_glPixelStorei
#define glPixelTransferf __indirect_glPixelTransferf
#define glPixelTransferi __indirect_glPixelTransferi
#define glPixelZoom __indirect_glPixelZoom
#define glPointSize __indirect_glPointSize
#define glPolygonMode __indirect_glPolygonMode
#define glPolygonOffset __indirect_glPolygonOffset
#define glPolygonStipple __indirect_glPolygonStipple
#define glPopAttrib __indirect_glPopAttrib
#define glPopClientAttrib __indirect_glPopClientAttrib
#define glPopMatrix __indirect_glPopMatrix
#define glPopName __indirect_glPopName
#define glPrioritizeTextures __indirect_glPrioritizeTextures
#define glPushAttrib __indirect_glPushAttrib
#define glPushClientAttrib __indirect_glPushClientAttrib
#define glPushMatrix __indirect_glPushMatrix
#define glPushName __indirect_glPushName
#define glRasterPos2d __indirect_glRasterPos2d
#define glRasterPos2dv __indirect_glRasterPos2dv
#define glRasterPos2f __indirect_glRasterPos2f
#define glRasterPos2fv __indirect_glRasterPos2fv
#define glRasterPos2i __indirect_glRasterPos2i
#define glRasterPos2iv __indirect_glRasterPos2iv
#define glRasterPos2s __indirect_glRasterPos2s
#define glRasterPos2sv __indirect_glRasterPos2sv
#define glRasterPos3d __indirect_glRasterPos3d
#define glRasterPos3dv __indirect_glRasterPos3dv
#define glRasterPos3f __indirect_glRasterPos3f
#define glRasterPos3fv __indirect_glRasterPos3fv
#define glRasterPos3i __indirect_glRasterPos3i
#define glRasterPos3iv __indirect_glRasterPos3iv
#define glRasterPos3s __indirect_glRasterPos3s
#define glRasterPos3sv __indirect_glRasterPos3sv
#define glRasterPos4d __indirect_glRasterPos4d
#define glRasterPos4dv __indirect_glRasterPos4dv
#define glRasterPos4f __indirect_glRasterPos4f
#define glRasterPos4fv __indirect_glRasterPos4fv
#define glRasterPos4i __indirect_glRasterPos4i
#define glRasterPos4iv __indirect_glRasterPos4iv
#define glRasterPos4s __indirect_glRasterPos4s
#define glRasterPos4sv __indirect_glRasterPos4sv
#define glReadBuffer __indirect_glReadBuffer
#define glReadPixels __indirect_glReadPixels
#define glRectd __indirect_glRectd
#define glRectdv __indirect_glRectdv
#define glRectf __indirect_glRectf
#define glRectfv __indirect_glRectfv
#define glRecti __indirect_glRecti
#define glRectiv __indirect_glRectiv
#define glRects __indirect_glRects
#define glRectsv __indirect_glRectsv
#define glRenderMode __indirect_glRenderMode
#define glRotated __indirect_glRotated
#define glRotatef __indirect_glRotatef
#define glScaled __indirect_glScaled
#define glScalef __indirect_glScalef
#define glScissor __indirect_glScissor
#define glSelectBuffer __indirect_glSelectBuffer
#define glShadeModel __indirect_glShadeModel
#define glStencilFunc __indirect_glStencilFunc
#define glStencilMask __indirect_glStencilMask
#define glStencilOp __indirect_glStencilOp
#define glTexCoord1d __indirect_glTexCoord1d
#define glTexCoord1dv __indirect_glTexCoord1dv
#define glTexCoord1f __indirect_glTexCoord1f
#define glTexCoord1fv __indirect_glTexCoord1fv
#define glTexCoord1i __indirect_glTexCoord1i
#define glTexCoord1iv __indirect_glTexCoord1iv
#define glTexCoord1s __indirect_glTexCoord1s
#define glTexCoord1sv __indirect_glTexCoord1sv
#define glTexCoord2d __indirect_glTexCoord2d
#define glTexCoord2dv __indirect_glTexCoord2dv
#define glTexCoord2f __indirect_glTexCoord2f
#define glTexCoord2fv __indirect_glTexCoord2fv
#define glTexCoord2i __indirect_glTexCoord2i
#define glTexCoord2iv __indirect_glTexCoord2iv
#define glTexCoord2s __indirect_glTexCoord2s
#define glTexCoord2sv __indirect_glTexCoord2sv
#define glTexCoord3d __indirect_glTexCoord3d
#define glTexCoord3dv __indirect_glTexCoord3dv
#define glTexCoord3f __indirect_glTexCoord3f
#define glTexCoord3fv __indirect_glTexCoord3fv
#define glTexCoord3i __indirect_glTexCoord3i
#define glTexCoord3iv __indirect_glTexCoord3iv
#define glTexCoord3s __indirect_glTexCoord3s
#define glTexCoord3sv __indirect_glTexCoord3sv
#define glTexCoord4d __indirect_glTexCoord4d
#define glTexCoord4dv __indirect_glTexCoord4dv
#define glTexCoord4f __indirect_glTexCoord4f
#define glTexCoord4fv __indirect_glTexCoord4fv
#define glTexCoord4i __indirect_glTexCoord4i
#define glTexCoord4iv __indirect_glTexCoord4iv
#define glTexCoord4s __indirect_glTexCoord4s
#define glTexCoord4sv __indirect_glTexCoord4sv
#define glTexCoordPointer __indirect_glTexCoordPointer
#define glTexEnvf __indirect_glTexEnvf
#define glTexEnvfv __indirect_glTexEnvfv
#define glTexEnvi __indirect_glTexEnvi
#define glTexEnviv __indirect_glTexEnviv
#define glTexGend __indirect_glTexGend
#define glTexGendv __indirect_glTexGendv
#define glTexGenf __indirect_glTexGenf
#define glTexGenfv __indirect_glTexGenfv
#define glTexGeni __indirect_glTexGeni
#define glTexGeniv __indirect_glTexGeniv
#define glTexImage1D __indirect_glTexImage1D
#define glTexImage2D __indirect_glTexImage2D
#define glTexParameterf __indirect_glTexParameterf
#define glTexParameterfv __indirect_glTexParameterfv
#define glTexParameteri __indirect_glTexParameteri
#define glTexParameteriv __indirect_glTexParameteriv
#define glTexSubImage1D __indirect_glTexSubImage1D
#define glTexSubImage2D __indirect_glTexSubImage2D
#define glTranslated __indirect_glTranslated
#define glTranslatef __indirect_glTranslatef
#define glVertex2d __indirect_glVertex2d
#define glVertex2dv __indirect_glVertex2dv
#define glVertex2f __indirect_glVertex2f
#define glVertex2fv __indirect_glVertex2fv
#define glVertex2i __indirect_glVertex2i
#define glVertex2iv __indirect_glVertex2iv
#define glVertex2s __indirect_glVertex2s
#define glVertex2sv __indirect_glVertex2sv
#define glVertex3d __indirect_glVertex3d
#define glVertex3dv __indirect_glVertex3dv
#define glVertex3f __indirect_glVertex3f
#define glVertex3fv __indirect_glVertex3fv
#define glVertex3i __indirect_glVertex3i
#define glVertex3iv __indirect_glVertex3iv
#define glVertex3s __indirect_glVertex3s
#define glVertex3sv __indirect_glVertex3sv
#define glVertex4d __indirect_glVertex4d
#define glVertex4dv __indirect_glVertex4dv
#define glVertex4f __indirect_glVertex4f
#define glVertex4fv __indirect_glVertex4fv
#define glVertex4i __indirect_glVertex4i
#define glVertex4iv __indirect_glVertex4iv
#define glVertex4s __indirect_glVertex4s
#define glVertex4sv __indirect_glVertex4sv
#define glVertexPointer __indirect_glVertexPointer
#define glViewport __indirect_glViewport

/* 1.2 */
#define glCopyTexSubImage3D __indirect_glCopyTexSubImage3D
#define glDrawRangeElements __indirect_glDrawRangeElements
#define glTexImage3D __indirect_glTexImage3D
#define glTexSubImage3D __indirect_glTexSubImage3D

/* 1.4 */
#define glMultiDrawArrays __indirect_glMultiDrawArrays
#define glMultiDrawElements __indirect_glMultiDrawElements
#define glBlendFuncSeparate __indirect_glBlendFuncSeparate

/* GL_ARB_imaging */
#define glBlendColor __indirect_glBlendColor
#define glBlendEquation __indirect_glBlendEquation
#define glColorSubTable __indirect_glColorSubTable
#define glColorTable __indirect_glColorTable
#define glColorTableParameterfv __indirect_glColorTableParameterfv
#define glColorTableParameteriv __indirect_glColorTableParameteriv
#define glConvolutionFilter1D __indirect_glConvolutionFilter1D
#define glConvolutionFilter2D __indirect_glConvolutionFilter2D
#define glConvolutionParameterf __indirect_glConvolutionParameterf
#define glConvolutionParameterfv __indirect_glConvolutionParameterfv
#define glConvolutionParameteri __indirect_glConvolutionParameteri
#define glConvolutionParameteriv __indirect_glConvolutionParameteriv
#define glCopyColorSubTable __indirect_glCopyColorSubTable
#define glCopyColorTable __indirect_glCopyColorTable
#define glCopyConvolutionFilter1D __indirect_glCopyConvolutionFilter1D
#define glCopyConvolutionFilter2D __indirect_glCopyConvolutionFilter2D
#define glGetColorTable __indirect_glGetColorTable
#define glGetColorTableParameterfv __indirect_glGetColorTableParameterfv
#define glGetColorTableParameteriv __indirect_glGetColorTableParameteriv
#define glGetConvolutionFilter __indirect_glGetConvolutionFilter
#define glGetConvolutionParameterfv __indirect_glGetConvolutionParameterfv
#define glGetConvolutionParameteriv __indirect_glGetConvolutionParameteriv
#define glGetHistogram __indirect_glGetHistogram
#define glGetHistogramParameterfv __indirect_glGetHistogramParameterfv
#define glGetHistogramParameteriv __indirect_glGetHistogramParameteriv
#define glGetMinmax __indirect_glGetMinmax
#define glGetMinmaxParameterfv __indirect_glGetMinmaxParameterfv
#define glGetMinmaxParameteriv __indirect_glGetMinmaxParameteriv
#define glGetSeparableFilter __indirect_glGetSeparableFilter
#define glHistogram __indirect_glHistogram
#define glMinmax __indirect_glMinmax
#define glResetHistogram __indirect_glResetHistogram
#define glResetMinmax __indirect_glResetMinmax
#define glSeparableFilter2D __indirect_glSeparableFilter2D

/* ARB 1. GL_ARB_multitexture */
#define glActiveTextureARB __indirect_glActiveTextureARB
#define glClientActiveTextureARB __indirect_glClientActiveTextureARB
#define glMultiTexCoord1dARB __indirect_glMultiTexCoord1dARB
#define glMultiTexCoord1dvARB __indirect_glMultiTexCoord1dvARB
#define glMultiTexCoord1fARB __indirect_glMultiTexCoord1fARB
#define glMultiTexCoord1fvARB __indirect_glMultiTexCoord1fvARB
#define glMultiTexCoord1iARB __indirect_glMultiTexCoord1iARB
#define glMultiTexCoord1ivARB __indirect_glMultiTexCoord1ivARB
#define glMultiTexCoord1sARB __indirect_glMultiTexCoord1sARB
#define glMultiTexCoord1svARB __indirect_glMultiTexCoord1svARB
#define glMultiTexCoord2dARB __indirect_glMultiTexCoord2dARB
#define glMultiTexCoord2dvARB __indirect_glMultiTexCoord2dvARB
#define glMultiTexCoord2fARB __indirect_glMultiTexCoord2fARB
#define glMultiTexCoord2fvARB __indirect_glMultiTexCoord2fvARB
#define glMultiTexCoord2iARB __indirect_glMultiTexCoord2iARB
#define glMultiTexCoord2ivARB __indirect_glMultiTexCoord2ivARB
#define glMultiTexCoord2sARB __indirect_glMultiTexCoord2sARB
#define glMultiTexCoord2svARB __indirect_glMultiTexCoord2svARB
#define glMultiTexCoord3dARB __indirect_glMultiTexCoord3dARB
#define glMultiTexCoord3dvARB __indirect_glMultiTexCoord3dvARB
#define glMultiTexCoord3fARB __indirect_glMultiTexCoord3fARB
#define glMultiTexCoord3fvARB __indirect_glMultiTexCoord3fvARB
#define glMultiTexCoord3iARB __indirect_glMultiTexCoord3iARB
#define glMultiTexCoord3ivARB __indirect_glMultiTexCoord3ivARB
#define glMultiTexCoord3sARB __indirect_glMultiTexCoord3sARB
#define glMultiTexCoord3svARB __indirect_glMultiTexCoord3svARB
#define glMultiTexCoord4dARB __indirect_glMultiTexCoord4dARB
#define glMultiTexCoord4dvARB __indirect_glMultiTexCoord4dvARB
#define glMultiTexCoord4fARB __indirect_glMultiTexCoord4fARB
#define glMultiTexCoord4fvARB __indirect_glMultiTexCoord4fvARB
#define glMultiTexCoord4iARB __indirect_glMultiTexCoord4iARB
#define glMultiTexCoord4ivARB __indirect_glMultiTexCoord4ivARB
#define glMultiTexCoord4sARB __indirect_glMultiTexCoord4sARB
#define glMultiTexCoord4svARB __indirect_glMultiTexCoord4svARB

/* ARB 3. ARB_transpose_matrix */

#define glLoadTransposeMatrixdARB __indirect_glLoadTransposeMatrixdARB
#define glLoadTransposeMatrixfARB __indirect_glLoadTransposeMatrixfARB
#define glMultTransposeMatrixdARB __indirect_glMultTransposeMatrixdARB
#define glMultTransposeMatrixfARB __indirect_glMultTransposeMatrixfARB

/* ARB 5. ARB_multisample */

#define glSampleCoverageARB __indirect_glSampleCoverageARB

/* ARB 12. ARB_texture_compression */

/* FIXME: Not yet supported. */

/* ARB 14. ARB_point_parameters / GL 1.4 / NV_point_sprite */

#define glPointParameterfARB __indirect_glPointParameterfARB
#define glPointParameterfvARB __indirect_glPointParameterfvARB
#define glPointParameteri __indirect_glPointParameteri
#define glPointParameteriv __indirect_glPointParameteriv

/* ARB 25. ARB_window_pos */

#define glWindowPos2dARB __indirect_glWindowPos2dARB
#define glWindowPos2fARB __indirect_glWindowPos2fARB
#define glWindowPos2iARB __indirect_glWindowPos2iARB
#define glWindowPos2sARB __indirect_glWindowPos2sARB
#define glWindowPos2dvARB __indirect_glWindowPos2dvARB
#define glWindowPos2fvARB __indirect_glWindowPos2fvARB
#define glWindowPos2ivARB __indirect_glWindowPos2ivARB
#define glWindowPos2svARB __indirect_glWindowPos2svARB
#define glWindowPos3dARB __indirect_glWindowPos3dARB
#define glWindowPos3fARB __indirect_glWindowPos3fARB
#define glWindowPos3iARB __indirect_glWindowPos3iARB
#define glWindowPos3sARB __indirect_glWindowPos3sARB
#define glWindowPos3dvARB __indirect_glWindowPos3dvARB
#define glWindowPos3fvARB __indirect_glWindowPos3fvARB
#define glWindowPos3ivARB __indirect_glWindowPos3ivARB
#define glWindowPos3svARB __indirect_glWindowPos3svARB

/*
* Extensions
*/

#define glBlendColorEXT __indirect_glBlendColorEXT

#define glPolygonOffsetEXT __indirect_glPolygonOffsetEXT

#define glCopyTexSubImage3DEXT __indirect_glCopyTexSubImage3DEXT
#define glTexImage3DEXT __indirect_glTexImage3DEXT
#define glTexSubImage3DEXT __indirect_glTexSubImage3DEXT

#define glGetTexFilterFuncSGIS __indirect_glGetTexFilterFuncSGIS
#define glTexFilterFuncSGIS __indirect_glTexFilterFuncSGIS

#define glTexSubImage1DEXT __indirect_glTexSubImage1DEXT
#define glTexSubImage2DEXT __indirect_glTexSubImage2DEXT

#define glCopyTexImage1DEXT __indirect_glCopyTexImage1DEXT
#define glCopyTexImage2DEXT __indirect_glCopyTexImage2DEXT
#define glCopyTexSubImage1DEXT __indirect_glCopyTexSubImage1DEXT
#define glCopyTexSubImage2DEXT __indirect_glCopyTexSubImage2DEXT

#define glGetHistogramEXT __indirect_glGetHistogramEXT
#define glGetHistogramParameterfvEXT __indirect_glGetHistogramParameterfvEXT
#define glGetHistogramParameterivEXT __indirect_glGetHistogramParameterivEXT
#define glGetMinmaxEXT __indirect_glGetMinmaxEXT
#define glGetMinmaxParameterfvEXT __indirect_glGetMinmaxParameterfvEXT
#define glGetMinmaxParameterivEXT __indirect_glGetMinmaxParameterivEXT
#define glHistogramEXT __indirect_glHistogramEXT
#define glMinmaxEXT __indirect_glMinmaxEXT
#define glResetHistogramEXT __indirect_glResetHistogramEXT
#define glResetMinmaxEXT __indirect_glResetMinmaxEXT

#define glConvolutionFilter1DEXT __indirect_glConvolutionFilter1DEXT
#define glConvolutionFilter2DEXT __indirect_glConvolutionFilter2DEXT
#define glConvolutionParameterfEXT __indirect_glConvolutionParameterfEXT
#define glConvolutionParameterfvEXT __indirect_glConvolutionParameterfvEXT
#define glConvolutionParameteriEXT __indirect_glConvolutionParameteriEXT
#define glConvolutionParameterivEXT __indirect_glConvolutionParameterivEXT
#define glCopyConvolutionFilter1DEXT __indirect_glCopyConvolutionFilter1DEXT
#define glCopyConvolutionFilter2DEXT __indirect_glCopyConvolutionFilter2DEXT
#define glGetConvolutionFilterEXT __indirect_glGetConvolutionFilterEXT
#define glGetConvolutionParameterfvEXT __indirect_glGetConvolutionParameterfvEXT
#define glGetConvolutionParameterivEXT __indirect_glGetConvolutionParameterivEXT
#define glGetSeparableFilterEXT __indirect_glGetSeparableFilterEXT
#define glSeparableFilter2DEXT __indirect_glSeparableFilter2DEXT

#define glColorTableSGI __indirect_glColorTableSGI
#define glColorTableParameterfvSGI __indirect_glColorTableParameterfvSGI
#define glColorTableParameterivSGI __indirect_glColorTableParameterivSGI
#define glCopyColorTableSGI __indirect_glCopyColorTableSGI
#define glGetColorTableSGI __indirect_glGetColorTableSGI
#define glGetColorTableParameterfvSGI __indirect_glGetColorTableParameterfvSGI
#define glGetColorTableParameterivSGI __indirect_glGetColorTableParameterivSGI

#define glPixelTexGenParameterfSGIS __indirect_glPixelTexGenParameterfSGIS
#define glPixelTexGenParameteriSGIS __indirect_glPixelTexGenParameteriSGIS
#define glGetPixelTexGenParameterfvSGIS __indirect_glGetPixelTexGenParameterfvSGIS
#define glGetPixelTexGenParameterivSGIS __indirect_glGetPixelTexGenParameterivSGIS

#define glTexImage4DSGIS __indirect_glTexImage4DSGIS
#define glTexSubImage4DSGIS __indirect_glTexSubImage4DSGIS

#define glAreTexturesResidentEXT __indirect_glAreTexturesResidentEXT
#define glBindTextureEXT __indirect_glBindTextureEXT
#define glDeleteTexturesEXT __indirect_glDeleteTexturesEXT
#define glGenTexturesEXT __indirect_glGenTexturesEXT
#define glIsTextureEXT __indirect_glIsTextureEXT
#define glPrioritizeTexturesEXT __indirect_glPrioritizeTexturesEXT

#define glDetailTexFuncSGIS __indirect_glDetailTexFuncSGIS
#define glGetDetailTexFuncSGIS __indirect_glGetDetailTexFuncSGIS

#define glGetSharpenTexFuncSGIS __indirect_glGetSharpenTexFuncSGIS
#define glSharpenTexFuncSGIS __indirect_glSharpenTexFuncSGIS

#define glSampleMaskSGIS __indirect_glSampleMaskSGIS
#define glSamplePatternSGIS __indirect_glSamplePatternSGIS

#define glArrayElementEXT __indirect_glArrayElementEXT
#define glColorPointerEXT __indirect_glColorPointerEXT
#define glDrawArraysEXT __indirect_glDrawArraysEXT
#define glEdgeFlagPointerEXT __indirect_glEdgeFlagPointerEXT
#define glGetPointervEXT __indirect_glGetPointervEXT
#define glIndexPointerEXT __indirect_glIndexPointerEXT
#define glNormalPointerEXT __indirect_glNormalPointerEXT
#define glTexCoordPointerEXT __indirect_glTexCoordPointerEXT
#define glVertexPointerEXT __indirect_glVertexPointerEXT

#define glBlendEquationEXT __indirect_glBlendEquationEXT

#define glSpriteParameterfSGIX __indirect_glSpriteParameterfSGIX
#define glSpriteParameterfvSGIX __indirect_glSpriteParameterfvSGIX
#define glSpriteParameteriSGIX __indirect_glSpriteParameteriSGIX
#define glSpriteParameterivSGIX __indirect_glSpriteParameterivSGIX

#define glPointParameterfEXT __indirect_glPointParameterfEXT
#define glPointParameterfvEXT __indirect_glPointParameterfvEXT

#define glGetInstrumentsSGIX __indirect_glGetInstrumentsSGIX
#define glInstrumentsBufferSGIX __indirect_glInstrumentsBufferSGIX
#define glPollInstrumentsSGIX __indirect_glPollInstrumentsSGIX
#define glReadInstrumentsSGIX __indirect_glReadInstrumentsSGIX
#define glStartInstrumentsSGIX __indirect_glStartInstrumentsSGIX
#define glStopInstrumentsSGIX __indirect_glStopInstrumentsSGIX

#define glFrameZoomSGIX __indirect_glFrameZoomSGIX

#define glReferencePlaneSGIX __indirect_glReferencePlaneSGIX

#define glFlushRasterSGIX __indirect_glFlushRasterSGIX

#define glGetImageTransformParameterfvHP __indirect_glGetImageTransformParameterfvHP
#define glGetImageTransformParameterivHP __indirect_glGetImageTransformParameterivHP
#define glImageTransformParameterfHP __indirect_glImageTransformParameterfHP
#define glImageTransformParameterfvHP __indirect_glImageTransformParameterfvHP
#define glImageTransformParameteriHP __indirect_glImageTransformParameteriHP
#define glImageTransformParameterivHP __indirect_glImageTransformParameterivHP

#define glColorSubTableEXT __indirect_glColorSubTableEXT
#define glCopyColorSubTableEXT __indirect_glCopyColorSubTableEXT

#define glHintPGI __indirect_glHintPGI

#define glColorTableEXT __indirect_glColorTableEXT
#define glGetColorTableEXT __indirect_glGetColorTableEXT
#define glGetColorTableParameterfvEXT __indirect_glGetColorTableParameterfvEXT
#define glGetColorTableParameterivEXT __indirect_glGetColorTableParameterivEXT

#define glGetListParameterfvSGIX __indirect_glGetListParameterfvSGIX
#define glGetListParameterivSGIX __indirect_glGetListParameterivSGIX
#define glListParameterfSGIX __indirect_glListParameterfSGIX
#define glListParameterfvSGIX __indirect_glListParameterfvSGIX
#define glListParameteriSGIX __indirect_glListParameteriSGIX
#define glListParameterivSGIX __indirect_glListParameterivSGIX

#define glIndexMaterialEXT __indirect_glIndexMaterialEXT

#define glIndexFuncEXT __indirect_glIndexFuncEXT

#define glLockArraysEXT __indirect_glLockArraysEXT
#define glUnlockArraysEXT __indirect_glUnlockArraysEXT

#define glCullParameterfvEXT __indirect_glCullParameterfvEXT
#define glCullParameterdvEXT __indirect_glCullParameterdvEXT

#define glBlendFuncSeparateINGR __indirect_glBlendFuncSeparateINGR

#define glWindowPos2iMESA __indirect_WindowPos2iMESA
#define glWindowPos2sMESA __indirect_WindowPos2sMESA
#define glWindowPos2fMESA __indirect_WindowPos2fMESA
#define glWindowPos2dMESA __indirect_WindowPos2dMESA
#define glWindowPos2ivMESA __indirect_WindowPos2ivMESA
#define glWindowPos2svMESA __indirect_WindowPos2svMESA
#define glWindowPos2fvMESA __indirect_WindowPos2fvMESA
#define glWindowPos2dvMESA __indirect_WindowPos2dvMESA
#define glWindowPos3iMESA __indirect_WindowPos3iMESA
#define glWindowPos3sMESA __indirect_WindowPos3sMESA
#define glWindowPos3fMESA __indirect_WindowPos3fMESA
#define glWindowPos3dMESA __indirect_WindowPos3dMESA
#define glWindowPos3ivMESA __indirect_WindowPos3ivMESA
#define glWindowPos3svMESA __indirect_WindowPos3svMESA
#define glWindowPos3fvMESA __indirect_WindowPos3fvMESA
#define glWindowPos3dvMESA __indirect_WindowPos3dvMESA
#define glWindowPos4iMESA __indirect_WindowPos4iMESA
#define glWindowPos4sMESA __indirect_WindowPos4sMESA
#define glWindowPos4fMESA __indirect_WindowPos4fMESA
#define glWindowPos4dMESA __indirect_WindowPos4dMESA
#define glWindowPos4ivMESA __indirect_WindowPos4ivMESA
#define glWindowPos4svMESA __indirect_WindowPos4svMESA
#define glWindowPos4fvMESA __indirect_WindowPos4fvMESA
#define glWindowPos4dvMESA __indirect_WindowPos4dvMESA

#define glResizeBuffersMESA __indirect_glResizeBuffersMESA

#define glActiveStencilFaceEXT __indirect_glActiveStencilFaceEXT

#define glPointParameterfARB __indirect_glPointParameterfARB
#define glPointParameterfvARB __indirect_glPointParameterfvARB

#define glActiveStencilFaceEXT __indirect_glActiveStencilFaceEXT

#define glWindowPos2dARB __indirect_glWindowPos2dARB
#define glWindowPos2iARB __indirect_glWindowPos2iARB
#define glWindowPos2fARB __indirect_glWindowPos2fARB
#define glWindowPos2iARB __indirect_glWindowPos2iARB
#define glWindowPos2sARB __indirect_glWindowPos2sARB
#define glWindowPos2dvARB __indirect_glWindowPos2dvARB
#define glWindowPos2fvARB __indirect_glWindowPos2fvARB
#define glWindowPos2ivARB __indirect_glWindowPos2ivARB
#define glWindowPos2svARB __indirect_glWindowPos2svARB
#define glWindowPos3dARB __indirect_glWindowPos3dARB
#define glWindowPos3fARB __indirect_glWindowPos3fARB
#define glWindowPos3iARB __indirect_glWindowPos3iARB
#define glWindowPos3sARB __indirect_glWindowPos3sARB
#define glWindowPos3dvARB __indirect_glWindowPos3dvARB
#define glWindowPos3fvARB __indirect_glWindowPos3fvARB
#define glWindowPos3ivARB __indirect_glWindowPos3ivARB
#define glWindowPos3svARB __indirect_glWindowPos3svARB

/* 145. GL_EXT_secondary_color / GL 1.4 */

#define glSecondaryColor3b __indirect_glSecondaryColor3b
#define glSecondaryColor3bv __indirect_glSecondaryColor3bv
#define glSecondaryColor3d __indirect_glSecondaryColor3d
#define glSecondaryColor3dv __indirect_glSecondaryColor3dv
#define glSecondaryColor3f __indirect_glSecondaryColor3f
#define glSecondaryColor3fv __indirect_glSecondaryColor3fv
#define glSecondaryColor3i __indirect_glSecondaryColor3i
#define glSecondaryColor3iv __indirect_glSecondaryColor3iv
#define glSecondaryColor3s __indirect_glSecondaryColor3s
#define glSecondaryColor3sv __indirect_glSecondaryColor3sv
#define glSecondaryColor3ub __indirect_glSecondaryColor3ub
#define glSecondaryColor3ubv __indirect_glSecondaryColor3ubv
#define glSecondaryColor3ui __indirect_glSecondaryColor3ui
#define glSecondaryColor3uiv __indirect_glSecondaryColor3uiv
#define glSecondaryColor3us __indirect_glSecondaryColor3us
#define glSecondaryColor3usv __indirect_glSecondaryColor3usv
#define glSecondaryColorPointer __indirect_glSecondaryColorPointer

/* 149. GL_EXT_fog_coord / GL 1.4 */

#define glFogCoordf __indirect_glFogCoordf
#define glFogCoordd __indirect_glFogCoordd
#define glFogCoordfv __indirect_glFogCoordfv
#define glFogCoorddv __indirect_glFogCoorddv
#define glFogCoordPointer __indirect_glFogCoordPointer

#endif /* _INDIRECT_WRAP_H_ */

+ 0
- 1
src/glx/x11/packrender.h Näytä tiedosto

@@ -37,7 +37,6 @@
**
*/

#define NEED_GL_FUNCS_WRAPPED
#include "glxclient.h"

/*

+ 2
- 4
src/glx/x11/pixelstore.c Näytä tiedosto

@@ -34,14 +34,12 @@
**
*/

#define NEED_GL_FUNCS_WRAPPED
#include "glxclient.h"
#include "indirect_wrap.h"

/*
** Specify parameters that control the storage format of pixel arrays.
*/
void glPixelStoref(GLenum pname, GLfloat param)
void __indirect_glPixelStoref(GLenum pname, GLfloat param)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = gc->client_state_private;
@@ -177,7 +175,7 @@ void glPixelStoref(GLenum pname, GLfloat param)
}
}

void glPixelStorei(GLenum pname, GLint param)
void __indirect_glPixelStorei(GLenum pname, GLint param)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = gc->client_state_private;

+ 16
- 15
src/glx/x11/render2.c Näytä tiedosto

@@ -35,6 +35,7 @@
*/

#include "packrender.h"
#include "indirect.h"
#include "size.h"

/*
@@ -43,7 +44,7 @@
** use the pixel header. See renderpix.c for those routines.
*/

void glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
void __indirect_glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
{
__GLX_DECLARE_VARIABLES();
__GLX_LOAD_VARIABLES();
@@ -68,7 +69,7 @@ void glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
}
}

void glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride,
void __indirect_glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride,
GLint order, const GLdouble *pnts)
{
__GLX_DECLARE_VARIABLES();
@@ -130,7 +131,7 @@ void glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride,
}
}

void glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride,
void __indirect_glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride,
GLint order, const GLfloat *pnts)
{
__GLX_DECLARE_VARIABLES();
@@ -188,7 +189,7 @@ void glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride,
}
}

void glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustr, GLint uord,
void __indirect_glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustr, GLint uord,
GLdouble v1, GLdouble v2, GLint vstr, GLint vord,
const GLdouble *pnts)
{
@@ -261,7 +262,7 @@ void glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustr, GLint uord,
}
}

void glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustr, GLint uord,
void __indirect_glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustr, GLint uord,
GLfloat v1, GLfloat v2, GLint vstr, GLint vord,
const GLfloat *pnts)
{
@@ -332,7 +333,7 @@ void glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustr, GLint uord,
}
}

void glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
void __indirect_glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
{
__GLX_DECLARE_VARIABLES();

@@ -361,7 +362,7 @@ void glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
}
}

void glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
void __indirect_glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
{
__GLX_DECLARE_VARIABLES();

@@ -390,7 +391,7 @@ void glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
}
}

void glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
void __indirect_glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
{
__GLX_DECLARE_VARIABLES();

@@ -419,7 +420,7 @@ void glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
}
}

void glEnable(GLenum cap)
void __indirect_glEnable(GLenum cap)
{
__GLX_DECLARE_VARIABLES();

@@ -435,7 +436,7 @@ void glEnable(GLenum cap)
case GL_VERTEX_ARRAY:
case GL_SECONDARY_COLOR_ARRAY:
case GL_FOG_COORD_ARRAY:
glEnableClientState(cap);
__indirect_glEnableClientState(cap);
return;
default:
break;
@@ -446,7 +447,7 @@ void glEnable(GLenum cap)
__GLX_END(8);
}

void glDisable(GLenum cap)
void __indirect_glDisable(GLenum cap)
{
__GLX_DECLARE_VARIABLES();

@@ -462,7 +463,7 @@ void glDisable(GLenum cap)
case GL_VERTEX_ARRAY:
case GL_SECONDARY_COLOR_ARRAY:
case GL_FOG_COORD_ARRAY:
glDisableClientState(cap);
__indirect_glDisableClientState(cap);
return;
default:
break;
@@ -473,7 +474,7 @@ void glDisable(GLenum cap)
__GLX_END(8);
}

void glSampleCoverageARB( GLfloat value, GLboolean invert )
void __indirect_glSampleCoverageARB( GLfloat value, GLboolean invert )
{
__GLX_DECLARE_VARIABLES();

@@ -486,7 +487,7 @@ void glSampleCoverageARB( GLfloat value, GLboolean invert )
__GLX_END(12);
}

void glSampleMaskSGIS( GLfloat value, GLboolean invert )
void __indirect_glSampleMaskSGIS( GLfloat value, GLboolean invert )
{
__GLX_DECLARE_VARIABLES();

@@ -499,7 +500,7 @@ void glSampleMaskSGIS( GLfloat value, GLboolean invert )
__GLX_END(12);
}

void glSamplePatternSGIS( GLenum pass )
void __indirect_glSamplePatternSGIS( GLenum pass )
{
__GLX_DECLARE_VARIABLES();


+ 14
- 14
src/glx/x11/renderpix.c Näytä tiedosto

@@ -109,7 +109,7 @@ static void SendLargeNULLImage(__GLXcontext *gc, GLint compsize,

/************************************************************************/

void glPolygonStipple(const GLubyte *mask)
void __indirect_glPolygonStipple(const GLubyte *mask)
{
__GLX_DECLARE_VARIABLES();

@@ -127,7 +127,7 @@ void glPolygonStipple(const GLubyte *mask)
__GLX_END(__GLX_PAD(compsize));
}

void glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig,
void __indirect_glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig,
GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
{
__GLX_DECLARE_VARIABLES();
@@ -178,7 +178,7 @@ void glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig,
}
}

void glTexImage1D(GLenum target, GLint level, GLint components,
void __indirect_glTexImage1D(GLenum target, GLint level, GLint components,
GLsizei width, GLint border, GLenum format, GLenum type,
const GLvoid *image)
{
@@ -254,7 +254,7 @@ void glTexImage1D(GLenum target, GLint level, GLint components,
}
}

void glTexImage2D(GLenum target, GLint level, GLint components,
void __indirect_glTexImage2D(GLenum target, GLint level, GLint components,
GLsizei width, GLsizei height, GLint border, GLenum format,
GLenum type, const GLvoid *image)
{
@@ -332,7 +332,7 @@ void glTexImage2D(GLenum target, GLint level, GLint components,
}
}

void glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type,
void __indirect_glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type,
const GLvoid *image)
{
__GLX_DECLARE_VARIABLES();
@@ -451,7 +451,7 @@ static void __glx_TexSubImage1D2D(GLshort opcode, GLenum target, GLint level,
}
}
void glTexSubImage1D(GLenum target, GLint level, GLint xoffset,
void __indirect_glTexSubImage1D(GLenum target, GLint level, GLint xoffset,
GLsizei width, GLenum format, GLenum type,
const GLvoid *image)
{
@@ -459,7 +459,7 @@ void glTexSubImage1D(GLenum target, GLint level, GLint xoffset,
0, width, 1, format, type, image, 1);
}

void glTexSubImage2D(GLenum target, GLint level, GLint xoffset,
void __indirect_glTexSubImage2D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLenum type, const GLvoid *image)
{
@@ -467,7 +467,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset,
yoffset, width, height, format, type, image, 2);
}

void glColorTable(GLenum target, GLenum internalformat, GLsizei width,
void __indirect_glColorTable(GLenum target, GLenum internalformat, GLsizei width,
GLenum format, GLenum type, const GLvoid *table)
{
__GLX_DECLARE_VARIABLES();
@@ -531,7 +531,7 @@ void glColorTable(GLenum target, GLenum internalformat, GLsizei width,
}
}

void glColorSubTable(GLenum target, GLsizei start, GLsizei count,
void __indirect_glColorSubTable(GLenum target, GLsizei start, GLsizei count,
GLenum format, GLenum type, const GLvoid *table)
{
__GLX_DECLARE_VARIABLES();
@@ -636,7 +636,7 @@ static void __glx_ConvolutionFilter1D2D(GLshort opcode, GLint dim,
}
}

void glConvolutionFilter1D(GLenum target, GLenum internalformat,
void __indirect_glConvolutionFilter1D(GLenum target, GLenum internalformat,
GLsizei width, GLenum format,
GLenum type, const GLvoid *image)
{
@@ -645,7 +645,7 @@ void glConvolutionFilter1D(GLenum target, GLenum internalformat,
image);
}

void glConvolutionFilter2D(GLenum target, GLenum internalformat,
void __indirect_glConvolutionFilter2D(GLenum target, GLenum internalformat,
GLsizei width, GLsizei height, GLenum format,
GLenum type, const GLvoid *image)
{
@@ -654,7 +654,7 @@ void glConvolutionFilter2D(GLenum target, GLenum internalformat,
image);
}

void glSeparableFilter2D(GLenum target, GLenum internalformat,
void __indirect_glSeparableFilter2D(GLenum target, GLenum internalformat,
GLsizei width, GLsizei height, GLenum format,
GLenum type, const GLvoid *row,
const GLvoid *column)
@@ -743,7 +743,7 @@ void glSeparableFilter2D(GLenum target, GLenum internalformat,
}
}

void glTexImage3D(GLenum target, GLint level, GLint internalformat,
void __indirect_glTexImage3D(GLenum target, GLint level, GLint internalformat,
GLsizei width, GLsizei height, GLsizei depth, GLint border,
GLenum format, GLenum type, const GLvoid *image)
{
@@ -821,7 +821,7 @@ void glTexImage3D(GLenum target, GLint level, GLint internalformat,
}
}

void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
void __indirect_glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
GLint zoffset, GLsizei width, GLsizei height,
GLsizei depth, GLenum format, GLenum type,
const GLvoid *image)

+ 14
- 15
src/glx/x11/single2.c Näytä tiedosto

@@ -34,7 +34,6 @@
**
*/

#define NEED_GL_FUNCS_WRAPPED
#include <stdio.h>
#include "glxclient.h"
#include "packsingle.h"
@@ -92,7 +91,7 @@ static void TransposeMatrixi(GLint m[16])
}
}

GLenum glGetError(void)
GLenum __indirect_glGetError(void)
{
__GLX_SINGLE_DECLARE_VARIABLES();
GLuint retval = GL_NO_ERROR;
@@ -114,7 +113,7 @@ GLenum glGetError(void)
return retval;
}

void glGetClipPlane(GLenum plane, GLdouble *equation)
void __indirect_glGetClipPlane(GLenum plane, GLdouble *equation)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -147,7 +146,7 @@ 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();
@@ -299,7 +298,7 @@ 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();
@@ -451,7 +450,7 @@ 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();
@@ -603,7 +602,7 @@ 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();
@@ -758,7 +757,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 +771,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 +786,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 +800,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 +837,7 @@ GLint glRenderMode(GLenum mode)
return retval;
}

void glFinish(void)
void __indirect_glFinish(void)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -868,7 +867,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 +1012,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 +1049,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);

+ 8
- 8
src/glx/x11/singlepix.c Näytä tiedosto

@@ -36,7 +36,7 @@

#include "packsingle.h"

void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
void __indirect_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type, GLvoid *pixels)
{
__GLX_SINGLE_DECLARE_VARIABLES();
@@ -85,7 +85,7 @@ void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
__GLX_SINGLE_END();
}

void glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type,
void __indirect_glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type,
GLvoid *texels)
{
__GLX_SINGLE_DECLARE_VARIABLES();
@@ -137,7 +137,7 @@ void glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type,
__GLX_SINGLE_END();
}

void glGetPolygonStipple(GLubyte *mask)
void __indirect_glGetPolygonStipple(GLubyte *mask)
{
__GLX_SINGLE_DECLARE_VARIABLES();
xGLXSingleReply reply;
@@ -156,7 +156,7 @@ void glGetPolygonStipple(GLubyte *mask)
__GLX_SINGLE_END();
}

void glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
void __indirect_glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
{
__GLX_SINGLE_DECLARE_VARIABLES();
const __GLXattribute * state;
@@ -203,7 +203,7 @@ void glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
__GLX_SINGLE_END();
}

void glGetConvolutionFilter(GLenum target, GLenum format, GLenum type,
void __indirect_glGetConvolutionFilter(GLenum target, GLenum format, GLenum type,
GLvoid *image)
{
__GLX_SINGLE_DECLARE_VARIABLES();
@@ -252,7 +252,7 @@ void glGetConvolutionFilter(GLenum target, GLenum format, GLenum type,
__GLX_SINGLE_END();
}

void glGetSeparableFilter(GLenum target, GLenum format, GLenum type,
void __indirect_glGetSeparableFilter(GLenum target, GLenum format, GLenum type,
GLvoid *row, GLvoid *column, GLvoid *span)
{
__GLX_SINGLE_DECLARE_VARIABLES();
@@ -319,7 +319,7 @@ void glGetSeparableFilter(GLenum target, GLenum format, GLenum type,
}

void glGetHistogram(GLenum target, GLboolean reset, GLenum format,
void __indirect_glGetHistogram(GLenum target, GLboolean reset, GLenum format,
GLenum type, GLvoid *values)
{
__GLX_SINGLE_DECLARE_VARIABLES();
@@ -368,7 +368,7 @@ void glGetHistogram(GLenum target, GLboolean reset, GLenum format,
__GLX_SINGLE_END();
}

void glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type,
void __indirect_glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type,
GLvoid *values)
{
__GLX_SINGLE_DECLARE_VARIABLES();

+ 50
- 50
src/glx/x11/vertarr.c Näytä tiedosto

@@ -34,10 +34,10 @@
**
*/

#define NEED_GL_FUNCS_WRAPPED
#include <assert.h>
#include "glxclient.h"
#include "packrender.h"
#include "indirect.h"
#include <string.h>
#include <limits.h> /* INT_MAX */

@@ -45,53 +45,53 @@
#define __GL_VERTEX_FUNC(NAME, let) \
case GL_##NAME: \
if (size == 2) \
vertexPointer->proc = (void (*)(const void *))glVertex2##let##v; \
vertexPointer->proc = (void (*)(const void *))__indirect_glVertex2##let##v; \
else if (size == 3) \
vertexPointer->proc = (void (*)(const void *))glVertex3##let##v; \
vertexPointer->proc = (void (*)(const void *))__indirect_glVertex3##let##v; \
else if (size == 4) \
vertexPointer->proc = (void (*)(const void *))glVertex4##let##v; \
vertexPointer->proc = (void (*)(const void *))__indirect_glVertex4##let##v; \
break

#define __GL_NORMAL_FUNC(NAME, let) \
case GL_##NAME: \
normalPointer->proc = (void (*)(const void *))glNormal3##let##v; \
normalPointer->proc = (void (*)(const void *))__indirect_glNormal3##let##v; \
break

#define __GL_COLOR_FUNC(NAME, let) \
case GL_##NAME: \
if (size == 3) \
colorPointer->proc = (void (*)(const void *))glColor3##let##v; \
colorPointer->proc = (void (*)(const void *))__indirect_glColor3##let##v; \
else if (size == 4)\
colorPointer->proc = (void (*)(const void *))glColor4##let##v; \
colorPointer->proc = (void (*)(const void *))__indirect_glColor4##let##v; \
break

#define __GL_SEC_COLOR_FUNC(NAME, let) \
case GL_##NAME: \
seccolorPointer->proc = (void (*)(const void *))glSecondaryColor3##let##v; \
seccolorPointer->proc = (void (*)(const void *))__indirect_glSecondaryColor3##let##vEXT; \

#define __GL_FOG_FUNC(NAME, let) \
case GL_##NAME: \
fogPointer->proc = (void (*)(const void *))glFogCoord##let##v; \
fogPointer->proc = (void (*)(const void *))__indirect_glFogCoord##let##vEXT; \

#define __GL_INDEX_FUNC(NAME, let) \
case GL_##NAME: \
indexPointer->proc = (void (*)(const void *))glIndex##let##v; \
indexPointer->proc = (void (*)(const void *))__indirect_glIndex##let##v; \
break

#define __GL_TEXTURE_FUNC(NAME, let) \
case GL_##NAME: \
if (size == 1) { \
texCoordPointer->proc = (void (*)(const void *))glTexCoord1##let##v; \
texCoordPointer->mtex_proc = (void (*)(GLenum, const void *))glMultiTexCoord1##let##vARB; \
texCoordPointer->proc = (void (*)(const void *))__indirect_glTexCoord1##let##v; \
texCoordPointer->mtex_proc = (void (*)(GLenum, const void *))__indirect_glMultiTexCoord1##let##vARB; \
} else if (size == 2) { \
texCoordPointer->proc = (void (*)(const void *))glTexCoord2##let##v; \
texCoordPointer->mtex_proc = (void (*)(GLenum, const void *))glMultiTexCoord2##let##vARB; \
texCoordPointer->proc = (void (*)(const void *))__indirect_glTexCoord2##let##v; \
texCoordPointer->mtex_proc = (void (*)(GLenum, const void *))__indirect_glMultiTexCoord2##let##vARB; \
} else if (size == 3) { \
texCoordPointer->proc = (void (*)(const void *))glTexCoord3##let##v; \
texCoordPointer->mtex_proc = (void (*)(GLenum, const void *))glMultiTexCoord2##let##vARB; \
texCoordPointer->proc = (void (*)(const void *))__indirect_glTexCoord3##let##v; \
texCoordPointer->mtex_proc = (void (*)(GLenum, const void *))__indirect_glMultiTexCoord2##let##vARB; \
} else if (size == 4) { \
texCoordPointer->proc = (void (*)(const void *))glTexCoord4##let##v; \
texCoordPointer->mtex_proc = (void (*)(GLenum, const void *))glMultiTexCoord4##let##vARB; \
texCoordPointer->proc = (void (*)(const void *))__indirect_glTexCoord4##let##v; \
texCoordPointer->mtex_proc = (void (*)(GLenum, const void *))__indirect_glMultiTexCoord4##let##vARB; \
} break

/**
@@ -165,7 +165,7 @@ void __glXInitVertexArrayState(__GLXcontext *gc)

/*****************************************************************************/

void glVertexPointer(GLint size, GLenum type, GLsizei stride,
void __indirect_glVertexPointer(GLint size, GLenum type, GLsizei stride,
const GLvoid *pointer)
{
__GLXcontext *gc = __glXGetCurrentContext();
@@ -202,7 +202,7 @@ void glVertexPointer(GLint size, GLenum type, GLsizei stride,
}
}

void glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
void __indirect_glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -238,7 +238,7 @@ void glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
}
}

void glColorPointer(GLint size, GLenum type, GLsizei stride,
void __indirect_glColorPointer(GLint size, GLenum type, GLsizei stride,
const GLvoid *pointer)
{
__GLXcontext *gc = __glXGetCurrentContext();
@@ -279,7 +279,7 @@ void glColorPointer(GLint size, GLenum type, GLsizei stride,
}
}

void glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
void __indirect_glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -315,7 +315,7 @@ void glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
}
}

void glTexCoordPointer(GLint size, GLenum type, GLsizei stride,
void __indirect_glTexCoordPointer(GLint size, GLenum type, GLsizei stride,
const GLvoid *pointer)
{
__GLXcontext *gc = __glXGetCurrentContext();
@@ -353,7 +353,7 @@ void glTexCoordPointer(GLint size, GLenum type, GLsizei stride,
}
}

void glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
void __indirect_glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -366,7 +366,7 @@ void glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
}

/* Choose appropriate api proc */
edgeFlagPointer->proc = (void (*)(const void *))glEdgeFlagv;
edgeFlagPointer->proc = (void (*)(const void *))__indirect_glEdgeFlagv;

edgeFlagPointer->stride = stride;
edgeFlagPointer->ptr = pointer;
@@ -380,7 +380,7 @@ void glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)

}

void glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride,
void __indirect_glSecondaryColorPointerEXT(GLint size, GLenum type, GLsizei stride,
const GLvoid * pointer )
{
__GLXcontext *gc = __glXGetCurrentContext();
@@ -421,7 +421,7 @@ void glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride,
}
}

void glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid * pointer)
void __indirect_glFogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid * pointer)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -455,7 +455,7 @@ void glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid * pointer)
}
}

void glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
void __indirect_glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -596,24 +596,24 @@ void glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
state->vertArray.enables = 0;
state->vertArray.texture_enables = 0;
if (tEnable) {
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glTexCoordPointer(tSize, tType, trueStride, (const char *)pointer);
__indirect_glEnableClientState(GL_TEXTURE_COORD_ARRAY);
__indirect_glTexCoordPointer(tSize, tType, trueStride, (const char *)pointer);
}
if (cEnable) {
glEnableClientState(GL_COLOR_ARRAY);
glColorPointer(cSize, cType, trueStride, (const char *)pointer+cOffset);
__indirect_glEnableClientState(GL_COLOR_ARRAY);
__indirect_glColorPointer(cSize, cType, trueStride, (const char *)pointer+cOffset);
}
if (nEnable) {
glEnableClientState(GL_NORMAL_ARRAY);
glNormalPointer(nType, trueStride, (const char *)pointer+nOffset);
__indirect_glEnableClientState(GL_NORMAL_ARRAY);
__indirect_glNormalPointer(nType, trueStride, (const char *)pointer+nOffset);
}
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(vSize, vType, trueStride, (const char *)pointer+vOffset);
__indirect_glEnableClientState(GL_VERTEX_ARRAY);
__indirect_glVertexPointer(vSize, vType, trueStride, (const char *)pointer+vOffset);
}

/*****************************************************************************/

void glArrayElement(GLint i)
void __indirect_glArrayElement(GLint i)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);
@@ -935,7 +935,7 @@ emit_DrawArrays_old(const __GLXattribute * const state,
tcaPtr[ j ] = va->texCoord[ j ].ptr + first * va->texCoord[ j ].skip;
}

glBegin(mode);
__indirect_glBegin(mode);
for (i = 0; i < count; i++) {
if (IS_TEXARRAY_ENABLED(state, 0)) {
(*va->texCoord[0].proc)(tcaPtr[0]);
@@ -959,7 +959,7 @@ emit_DrawArrays_old(const __GLXattribute * const state,
}
}
}
glEnd();
__indirect_glEnd();
}


@@ -1000,7 +1000,7 @@ glx_validate_array_args(__GLXcontext *gc, GLenum mode, GLsizei count)
}


void glDrawArrays(GLenum mode, GLint first, GLsizei count)
void __indirect_glDrawArrays(GLenum mode, GLint first, GLsizei count)
{
__GLXcontext *gc = __glXGetCurrentContext();
const __GLXattribute * state =
@@ -1029,7 +1029,7 @@ void glDrawArrays(GLenum mode, GLint first, GLsizei count)
* would probably require refactoring out parts of \c emit_DrawArraysEXT into
* more general functions that could be used in either place.
*/
void glDrawElements(GLenum mode, GLsizei count, GLenum type,
void __indirect_glDrawElements(GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices)
{
__GLXcontext *gc = __glXGetCurrentContext();
@@ -1059,7 +1059,7 @@ void glDrawElements(GLenum mode, GLsizei count, GLenum type,
return;
}

glBegin(mode);
__indirect_glBegin(mode);
for (i = 0; i < count; i++) {
switch (type) {
case GL_UNSIGNED_BYTE:
@@ -1096,10 +1096,10 @@ void glDrawElements(GLenum mode, GLsizei count, GLenum type,
}
}
}
glEnd();
__indirect_glEnd();
}

void glDrawRangeElements(GLenum mode, GLuint start, GLuint end,
void __indirect_glDrawRangeElements(GLenum mode, GLuint start, GLuint end,
GLsizei count, GLenum type,
const GLvoid *indices)
{
@@ -1110,22 +1110,22 @@ void glDrawRangeElements(GLenum mode, GLuint start, GLuint end,
return;
}

glDrawElements(mode,count,type,indices);
__indirect_glDrawElements(mode,count,type,indices);
}

void glMultiDrawArrays(GLenum mode, GLint *first, GLsizei *count,
void __indirect_glMultiDrawArraysEXT(GLenum mode, GLint *first, GLsizei *count,
GLsizei primcount)
{
GLsizei i;

for(i=0; i<primcount; i++) {
if ( count[i] > 0 ) {
glDrawArrays( mode, first[i], count[i] );
__indirect_glDrawArrays( mode, first[i], count[i] );
}
}
}

void glMultiDrawElements(GLenum mode, const GLsizei *count,
void __indirect_glMultiDrawElementsEXT(GLenum mode, const GLsizei *count,
GLenum type, const GLvoid ** indices,
GLsizei primcount)
{
@@ -1133,12 +1133,12 @@ void glMultiDrawElements(GLenum mode, const GLsizei *count,

for(i=0; i<primcount; i++) {
if ( count[i] > 0 ) {
glDrawElements( mode, count[i], type, indices[i] );
__indirect_glDrawElements( mode, count[i], type, indices[i] );
}
}
}

void glClientActiveTextureARB(GLenum texture)
void __indirect_glClientActiveTextureARB(GLenum texture)
{
__GLXcontext *gc = __glXGetCurrentContext();
__GLXattribute * state = (__GLXattribute *)(gc->client_state_private);

Write Preview
Loading…
Peruuta
Tallenna