diff options
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/api_loopback.c | 50 | ||||
-rw-r--r-- | src/mesa/main/dd.h | 18 | ||||
-rw-r--r-- | src/mesa/main/dispatch.c | 23 | ||||
-rw-r--r-- | src/mesa/main/dlist.c | 84 | ||||
-rw-r--r-- | src/mesa/main/glprocs.h | 195 | ||||
-rw-r--r-- | src/mesa/main/state.c | 34 | ||||
-rw-r--r-- | src/mesa/main/vtxfmt.c | 31 | ||||
-rw-r--r-- | src/mesa/main/vtxfmt_tmp.h | 214 |
8 files changed, 328 insertions, 321 deletions
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c index ca7c9b77ac6..3ec4f30f362 100644 --- a/src/mesa/main/api_loopback.c +++ b/src/mesa/main/api_loopback.c @@ -1,4 +1,4 @@ -/* $Id: api_loopback.c,v 1.10 2001/11/18 22:48:11 brianp Exp $ */ +/* $Id: api_loopback.c,v 1.11 2001/12/04 23:43:31 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1522,30 +1522,30 @@ _mesa_loopback_init_api_table( struct _glapi_table *dest, dest->Vertex4dv = loopback_Vertex4dv; dest->Vertex4iv = loopback_Vertex4iv; dest->Vertex4sv = loopback_Vertex4sv; - dest->MultiTexCoord1d = loopback_MultiTexCoord1dARB; - dest->MultiTexCoord1dv = loopback_MultiTexCoord1dvARB; - dest->MultiTexCoord1i = loopback_MultiTexCoord1iARB; - dest->MultiTexCoord1iv = loopback_MultiTexCoord1ivARB; - dest->MultiTexCoord1s = loopback_MultiTexCoord1sARB; - dest->MultiTexCoord1sv = loopback_MultiTexCoord1svARB; - dest->MultiTexCoord2d = loopback_MultiTexCoord2dARB; - dest->MultiTexCoord2dv = loopback_MultiTexCoord2dvARB; - dest->MultiTexCoord2i = loopback_MultiTexCoord2iARB; - dest->MultiTexCoord2iv = loopback_MultiTexCoord2ivARB; - dest->MultiTexCoord2s = loopback_MultiTexCoord2sARB; - dest->MultiTexCoord2sv = loopback_MultiTexCoord2svARB; - dest->MultiTexCoord3d = loopback_MultiTexCoord3dARB; - dest->MultiTexCoord3dv = loopback_MultiTexCoord3dvARB; - dest->MultiTexCoord3i = loopback_MultiTexCoord3iARB; - dest->MultiTexCoord3iv = loopback_MultiTexCoord3ivARB; - dest->MultiTexCoord3s = loopback_MultiTexCoord3sARB; - dest->MultiTexCoord3sv = loopback_MultiTexCoord3svARB; - dest->MultiTexCoord4d = loopback_MultiTexCoord4dARB; - dest->MultiTexCoord4dv = loopback_MultiTexCoord4dvARB; - dest->MultiTexCoord4i = loopback_MultiTexCoord4iARB; - dest->MultiTexCoord4iv = loopback_MultiTexCoord4ivARB; - dest->MultiTexCoord4s = loopback_MultiTexCoord4sARB; - dest->MultiTexCoord4sv = loopback_MultiTexCoord4svARB; + dest->MultiTexCoord1dARB = loopback_MultiTexCoord1dARB; + dest->MultiTexCoord1dvARB = loopback_MultiTexCoord1dvARB; + dest->MultiTexCoord1iARB = loopback_MultiTexCoord1iARB; + dest->MultiTexCoord1ivARB = loopback_MultiTexCoord1ivARB; + dest->MultiTexCoord1sARB = loopback_MultiTexCoord1sARB; + dest->MultiTexCoord1svARB = loopback_MultiTexCoord1svARB; + dest->MultiTexCoord2dARB = loopback_MultiTexCoord2dARB; + dest->MultiTexCoord2dvARB = loopback_MultiTexCoord2dvARB; + dest->MultiTexCoord2iARB = loopback_MultiTexCoord2iARB; + dest->MultiTexCoord2ivARB = loopback_MultiTexCoord2ivARB; + dest->MultiTexCoord2sARB = loopback_MultiTexCoord2sARB; + dest->MultiTexCoord2svARB = loopback_MultiTexCoord2svARB; + dest->MultiTexCoord3dARB = loopback_MultiTexCoord3dARB; + dest->MultiTexCoord3dvARB = loopback_MultiTexCoord3dvARB; + dest->MultiTexCoord3iARB = loopback_MultiTexCoord3iARB; + dest->MultiTexCoord3ivARB = loopback_MultiTexCoord3ivARB; + dest->MultiTexCoord3sARB = loopback_MultiTexCoord3sARB; + dest->MultiTexCoord3svARB = loopback_MultiTexCoord3svARB; + dest->MultiTexCoord4dARB = loopback_MultiTexCoord4dARB; + dest->MultiTexCoord4dvARB = loopback_MultiTexCoord4dvARB; + dest->MultiTexCoord4iARB = loopback_MultiTexCoord4iARB; + dest->MultiTexCoord4ivARB = loopback_MultiTexCoord4ivARB; + dest->MultiTexCoord4sARB = loopback_MultiTexCoord4sARB; + dest->MultiTexCoord4svARB = loopback_MultiTexCoord4svARB; dest->EvalCoord2dv = loopback_EvalCoord2dv; dest->EvalCoord2fv = loopback_EvalCoord2fv; dest->EvalCoord2d = loopback_EvalCoord2d; diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index fff457b4667..52707e14f43 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -1,4 +1,4 @@ -/* $Id: dd.h,v 1.63 2001/11/18 22:48:11 brianp Exp $ */ +/* $Id: dd.h,v 1.64 2001/12/04 23:43:31 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -665,14 +665,14 @@ typedef struct { void (*Indexi)( GLint ); void (*Indexiv)( const GLint * ); void (*Materialfv)( GLenum face, GLenum pname, const GLfloat * ); /* NOTE */ - void (*MultiTexCoord1f)( GLenum, GLfloat ); - void (*MultiTexCoord1fv)( GLenum, const GLfloat * ); - void (*MultiTexCoord2f)( GLenum, GLfloat, GLfloat ); - void (*MultiTexCoord2fv)( GLenum, const GLfloat * ); - void (*MultiTexCoord3f)( GLenum, GLfloat, GLfloat, GLfloat ); - void (*MultiTexCoord3fv)( GLenum, const GLfloat * ); - void (*MultiTexCoord4f)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat ); - void (*MultiTexCoord4fv)( GLenum, const GLfloat * ); + void (*MultiTexCoord1fARB)( GLenum, GLfloat ); + void (*MultiTexCoord1fvARB)( GLenum, const GLfloat * ); + void (*MultiTexCoord2fARB)( GLenum, GLfloat, GLfloat ); + void (*MultiTexCoord2fvARB)( GLenum, const GLfloat * ); + void (*MultiTexCoord3fARB)( GLenum, GLfloat, GLfloat, GLfloat ); + void (*MultiTexCoord3fvARB)( GLenum, const GLfloat * ); + void (*MultiTexCoord4fARB)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat ); + void (*MultiTexCoord4fvARB)( GLenum, const GLfloat * ); void (*Normal3f)( GLfloat, GLfloat, GLfloat ); void (*Normal3fv)( const GLfloat * ); void (*SecondaryColor3fEXT)( GLfloat, GLfloat, GLfloat ); diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c index 647ee481f7c..5e0f03537b3 100644 --- a/src/mesa/main/dispatch.c +++ b/src/mesa/main/dispatch.c @@ -1,4 +1,4 @@ -/* $Id: dispatch.c,v 1.24 2001/09/14 22:19:19 brianp Exp $ */ +/* $Id: dispatch.c,v 1.25 2001/12/04 23:43:31 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -28,10 +28,7 @@ /* * This file generates all the gl* function entyrpoints. * But if we're using X86-optimized dispatch (X86/glapi_x86.S) then - * we don't use this file's code. - * - * Eventually this file may be replaced by automatically generated - * code from an API spec file. + * we don't use this code. * * NOTE: This file should _not_ be used when compiling Mesa for a DRI- * based device driver. @@ -64,8 +61,22 @@ #define NAME(func) gl##func #endif + +#if 0 /* Use this to log GL calls to stdout */ + +#define F stdout #define DISPATCH(FUNC, ARGS, MESSAGE) \ - (_glapi_Dispatch->FUNC) ARGS + (_glapi_Dispatch->FUNC) ARGS; \ + fprintf MESSAGE; \ + fprintf(F, "\n"); + +#else + +#define DISPATCH(FUNC, ARGS, MESSAGE) \ + (_glapi_Dispatch->FUNC) ARGS; + +#endif /* logging */ + #define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \ return (_glapi_Dispatch->FUNC) ARGS diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index ea6d6d76639..768d3ac707d 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -1,4 +1,4 @@ -/* $Id: dlist.c,v 1.78 2001/11/18 23:52:37 brianp Exp $ */ +/* $Id: dlist.c,v 1.79 2001/12/04 23:43:31 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -2490,7 +2490,7 @@ save_PointParameterfvEXT( GLenum pname, const GLfloat *params ) n[4].f = params[2]; } if (ctx->ExecuteFlag) { - (*ctx->Exec->PointParameterfvARB)( pname, params ); + (*ctx->Exec->PointParameterfvEXT)( pname, params ); } } @@ -3658,7 +3658,7 @@ static void save_ActiveTextureARB( GLenum target ) n[1].e = target; } if (ctx->ExecuteFlag) { - (*ctx->Exec->ActiveTexture)( target ); + (*ctx->Exec->ActiveTextureARB)( target ); } } @@ -3725,8 +3725,8 @@ save_CompressedTexImage1DARB(GLenum target, GLint level, GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_1D) { /* don't compile, execute immediately */ - (*ctx->Exec->CompressedTexImage1D)(target, level, internalFormat, - width, border, imageSize, data); + (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat, + width, border, imageSize, data); } else { Node *n; @@ -3753,8 +3753,8 @@ save_CompressedTexImage1DARB(GLenum target, GLint level, FREE(image); } if (ctx->ExecuteFlag) { - (*ctx->Exec->CompressedTexImage1D)(target, level, internalFormat, - width, border, imageSize, data); + (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat, + width, border, imageSize, data); } } } @@ -3769,7 +3769,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level, GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_2D) { /* don't compile, execute immediately */ - (*ctx->Exec->CompressedTexImage2D)(target, level, internalFormat, + (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat, width, height, border, imageSize, data); } else { @@ -3798,7 +3798,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level, FREE(image); } if (ctx->ExecuteFlag) { - (*ctx->Exec->CompressedTexImage2D)(target, level, internalFormat, + (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat, width, height, border, imageSize, data); } } @@ -3814,7 +3814,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level, GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_3D) { /* don't compile, execute immediately */ - (*ctx->Exec->CompressedTexImage3D)(target, level, internalFormat, + (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat, width, height, depth, border, imageSize, data); } else { @@ -3844,7 +3844,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level, FREE(image); } if (ctx->ExecuteFlag) { - (*ctx->Exec->CompressedTexImage3D)(target, level, internalFormat, + (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat, width, height, depth, border, imageSize, data); } } @@ -3883,7 +3883,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, FREE(image); } if (ctx->ExecuteFlag) { - (*ctx->Exec->CompressedTexSubImage1D)(target, level, xoffset, + (*ctx->Exec->CompressedTexSubImage1DARB)(target, level, xoffset, width, format, imageSize, data); } } @@ -3924,7 +3924,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, FREE(image); } if (ctx->ExecuteFlag) { - (*ctx->Exec->CompressedTexSubImage2D)(target, level, xoffset, yoffset, + (*ctx->Exec->CompressedTexSubImage2DARB)(target, level, xoffset, yoffset, width, height, format, imageSize, data); } } @@ -3967,7 +3967,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, FREE(image); } if (ctx->ExecuteFlag) { - (*ctx->Exec->CompressedTexSubImage3D)(target, level, xoffset, yoffset, + (*ctx->Exec->CompressedTexSubImage3DARB)(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data); } } @@ -3986,7 +3986,7 @@ save_SampleCoverageARB(GLclampf value, GLboolean invert) n[2].b = invert; } if (ctx->ExecuteFlag) { - (*ctx->Exec->SampleCoverage)( value, invert ); + (*ctx->Exec->SampleCoverageARB)( value, invert ); } } @@ -4487,7 +4487,7 @@ execute_list( GLcontext *ctx, GLuint list ) params[0] = n[2].f; params[1] = n[3].f; params[2] = n[4].f; - (*ctx->Exec->PointParameterfvARB)( n[1].e, params ); + (*ctx->Exec->PointParameterfvEXT)( n[1].e, params ); } break; case OPCODE_POLYGON_MODE: @@ -4676,7 +4676,7 @@ execute_list( GLcontext *ctx, GLuint list ) (*ctx->Exec->WindowPos4fMESA)( n[1].f, n[2].f, n[3].f, n[4].f ); break; case OPCODE_ACTIVE_TEXTURE: /* GL_ARB_multitexture */ - (*ctx->Exec->ActiveTexture)( n[1].e ); + (*ctx->Exec->ActiveTextureARB)( n[1].e ); break; case OPCODE_PIXEL_TEXGEN_SGIX: /* GL_SGIX_pixel_texture */ (*ctx->Exec->PixelTexGenSGIX)( n[1].e ); @@ -4685,32 +4685,32 @@ execute_list( GLcontext *ctx, GLuint list ) (*ctx->Exec->PixelTexGenParameteriSGIS)( n[1].e, n[2].i ); break; case OPCODE_COMPRESSED_TEX_IMAGE_1D: /* GL_ARB_texture_compression */ - (*ctx->Exec->CompressedTexImage1D)(n[1].e, n[2].i, n[3].e, + (*ctx->Exec->CompressedTexImage1DARB)(n[1].e, n[2].i, n[3].e, n[4].i, n[5].i, n[6].i, n[7].data); break; case OPCODE_COMPRESSED_TEX_IMAGE_2D: /* GL_ARB_texture_compression */ - (*ctx->Exec->CompressedTexImage2D)(n[1].e, n[2].i, n[3].e, + (*ctx->Exec->CompressedTexImage2DARB)(n[1].e, n[2].i, n[3].e, n[4].i, n[5].i, n[6].i, n[7].i, n[8].data); break; case OPCODE_COMPRESSED_TEX_IMAGE_3D: /* GL_ARB_texture_compression */ - (*ctx->Exec->CompressedTexImage3D)(n[1].e, n[2].i, n[3].e, + (*ctx->Exec->CompressedTexImage3DARB)(n[1].e, n[2].i, n[3].e, n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, n[9].data); break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: /* GL_ARB_texture_compress */ - (*ctx->Exec->CompressedTexSubImage1D)(n[1].e, n[2].i, n[3].i, + (*ctx->Exec->CompressedTexSubImage1DARB)(n[1].e, n[2].i, n[3].i, n[4].i, n[5].e, n[6].i, n[7].data); break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D: /* GL_ARB_texture_compress */ - (*ctx->Exec->CompressedTexSubImage2D)(n[1].e, n[2].i, n[3].i, + (*ctx->Exec->CompressedTexSubImage2DARB)(n[1].e, n[2].i, n[3].i, n[4].i, n[5].i, n[6].i, n[7].e, n[8].i, n[9].data); break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D: /* GL_ARB_texture_compress */ - (*ctx->Exec->CompressedTexSubImage3D)(n[1].e, n[2].i, n[3].i, + (*ctx->Exec->CompressedTexSubImage3DARB)(n[1].e, n[2].i, n[3].i, n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, n[9].e, n[10].i, n[11].data); break; case OPCODE_SAMPLE_COVERAGE: /* GL_ARB_multisample */ - (*ctx->Exec->SampleCoverage)(n[1].f, n[2].b); + (*ctx->Exec->SampleCoverageARB)(n[1].f, n[2].b); break; case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */ (*ctx->Exec->WindowPos3fARB)( n[1].f, n[2].f, n[3].f ); @@ -5375,7 +5375,7 @@ static void exec_GetCompressedTexImageARB(GLenum target, GLint level, { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - ctx->Exec->GetCompressedTexImage( target, level, img); + ctx->Exec->GetCompressedTexImageARB( target, level, img); } static void exec_VertexPointer(GLint size, GLenum type, GLsizei stride, @@ -5607,7 +5607,7 @@ static void exec_ClientActiveTextureARB( GLenum target ) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - ctx->Exec->ClientActiveTexture(target); + ctx->Exec->ClientActiveTextureARB(target); } static void exec_SecondaryColorPointerEXT(GLint size, GLenum type, @@ -5927,8 +5927,8 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize ) #endif /* 54. GL_EXT_point_parameters */ - table->PointParameterfARB = save_PointParameterfEXT; - table->PointParameterfvARB = save_PointParameterfvEXT; + table->PointParameterfEXT = save_PointParameterfEXT; + table->PointParameterfvEXT = save_PointParameterfvEXT; /* 78. GL_EXT_paletted_texture */ #if 0 @@ -5944,8 +5944,8 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize ) table->UnlockArraysEXT = exec_UnlockArraysEXT; /* GL_ARB_multitexture */ - table->ActiveTexture = save_ActiveTextureARB; - table->ClientActiveTexture = exec_ClientActiveTextureARB; + table->ActiveTextureARB = save_ActiveTextureARB; + table->ClientActiveTextureARB = exec_ClientActiveTextureARB; /* GL_EXT_blend_func_separate */ table->BlendFuncSeparateEXT = save_BlendFuncSeparateEXT; @@ -5980,22 +5980,22 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize ) table->ResizeBuffersMESA = exec_ResizeBuffersMESA; /* GL_ARB_transpose_matrix */ - table->LoadTransposeMatrixd = save_LoadTransposeMatrixdARB; - table->LoadTransposeMatrixf = save_LoadTransposeMatrixfARB; - table->MultTransposeMatrixd = save_MultTransposeMatrixdARB; - table->MultTransposeMatrixf = save_MultTransposeMatrixfARB; + table->LoadTransposeMatrixdARB = save_LoadTransposeMatrixdARB; + table->LoadTransposeMatrixfARB = save_LoadTransposeMatrixfARB; + table->MultTransposeMatrixdARB = save_MultTransposeMatrixdARB; + table->MultTransposeMatrixfARB = save_MultTransposeMatrixfARB; /* GL_ARB_multisample */ - table->SampleCoverage = save_SampleCoverageARB; + table->SampleCoverageARB = save_SampleCoverageARB; /* ARB 12. GL_ARB_texture_compression */ - table->CompressedTexImage3D = save_CompressedTexImage3DARB; - table->CompressedTexImage2D = save_CompressedTexImage2DARB; - table->CompressedTexImage1D = save_CompressedTexImage1DARB; - table->CompressedTexSubImage3D = save_CompressedTexSubImage3DARB; - table->CompressedTexSubImage2D = save_CompressedTexSubImage2DARB; - table->CompressedTexSubImage1D = save_CompressedTexSubImage1DARB; - table->GetCompressedTexImage = exec_GetCompressedTexImageARB; + table->CompressedTexImage3DARB = save_CompressedTexImage3DARB; + table->CompressedTexImage2DARB = save_CompressedTexImage2DARB; + table->CompressedTexImage1DARB = save_CompressedTexImage1DARB; + table->CompressedTexSubImage3DARB = save_CompressedTexSubImage3DARB; + table->CompressedTexSubImage2DARB = save_CompressedTexSubImage2DARB; + table->CompressedTexSubImage1DARB = save_CompressedTexSubImage1DARB; + table->GetCompressedTexImageARB = exec_GetCompressedTexImageARB; /* GL_EXT_secondary_color */ table->SecondaryColorPointerEXT = exec_SecondaryColorPointerEXT; diff --git a/src/mesa/main/glprocs.h b/src/mesa/main/glprocs.h index f79083c9ba0..c91be5a030e 100644 --- a/src/mesa/main/glprocs.h +++ b/src/mesa/main/glprocs.h @@ -379,98 +379,97 @@ static struct name_address_offset static_functions[] = { { "glTexImage3D", (GLvoid *) glTexImage3D, _gloffset_TexImage3D }, { "glTexSubImage3D", (GLvoid *) glTexSubImage3D, _gloffset_TexSubImage3D }, { "glCopyTexSubImage3D", (GLvoid *) glCopyTexSubImage3D, _gloffset_CopyTexSubImage3D }, - { "glActiveTexture", (GLvoid *) glActiveTexture, _gloffset_ActiveTexture }, - { "glClientActiveTexture", (GLvoid *) glClientActiveTexture, _gloffset_ClientActiveTexture }, - { "glMultiTexCoord1d", (GLvoid *) glMultiTexCoord1d, _gloffset_MultiTexCoord1d }, - { "glMultiTexCoord1dv", (GLvoid *) glMultiTexCoord1dv, _gloffset_MultiTexCoord1dv }, - { "glMultiTexCoord1f", (GLvoid *) glMultiTexCoord1f, _gloffset_MultiTexCoord1f }, - { "glMultiTexCoord1fv", (GLvoid *) glMultiTexCoord1fv, _gloffset_MultiTexCoord1fv }, - { "glMultiTexCoord1i", (GLvoid *) glMultiTexCoord1i, _gloffset_MultiTexCoord1i }, - { "glMultiTexCoord1iv", (GLvoid *) glMultiTexCoord1iv, _gloffset_MultiTexCoord1iv }, - { "glMultiTexCoord1s", (GLvoid *) glMultiTexCoord1s, _gloffset_MultiTexCoord1s }, - { "glMultiTexCoord1sv", (GLvoid *) glMultiTexCoord1sv, _gloffset_MultiTexCoord1sv }, - { "glMultiTexCoord2d", (GLvoid *) glMultiTexCoord2d, _gloffset_MultiTexCoord2d }, - { "glMultiTexCoord2dv", (GLvoid *) glMultiTexCoord2dv, _gloffset_MultiTexCoord2dv }, - { "glMultiTexCoord2f", (GLvoid *) glMultiTexCoord2f, _gloffset_MultiTexCoord2f }, - { "glMultiTexCoord2fv", (GLvoid *) glMultiTexCoord2fv, _gloffset_MultiTexCoord2fv }, - { "glMultiTexCoord2i", (GLvoid *) glMultiTexCoord2i, _gloffset_MultiTexCoord2i }, - { "glMultiTexCoord2iv", (GLvoid *) glMultiTexCoord2iv, _gloffset_MultiTexCoord2iv }, - { "glMultiTexCoord2s", (GLvoid *) glMultiTexCoord2s, _gloffset_MultiTexCoord2s }, - { "glMultiTexCoord2sv", (GLvoid *) glMultiTexCoord2sv, _gloffset_MultiTexCoord2sv }, - { "glMultiTexCoord3d", (GLvoid *) glMultiTexCoord3d, _gloffset_MultiTexCoord3d }, - { "glMultiTexCoord3dv", (GLvoid *) glMultiTexCoord3dv, _gloffset_MultiTexCoord3dv }, - { "glMultiTexCoord3f", (GLvoid *) glMultiTexCoord3f, _gloffset_MultiTexCoord3f }, - { "glMultiTexCoord3fv", (GLvoid *) glMultiTexCoord3fv, _gloffset_MultiTexCoord3fv }, - { "glMultiTexCoord3i", (GLvoid *) glMultiTexCoord3i, _gloffset_MultiTexCoord3i }, - { "glMultiTexCoord3iv", (GLvoid *) glMultiTexCoord3iv, _gloffset_MultiTexCoord3iv }, - { "glMultiTexCoord3s", (GLvoid *) glMultiTexCoord3s, _gloffset_MultiTexCoord3s }, - { "glMultiTexCoord3sv", (GLvoid *) glMultiTexCoord3sv, _gloffset_MultiTexCoord3sv }, - { "glMultiTexCoord4d", (GLvoid *) glMultiTexCoord4d, _gloffset_MultiTexCoord4d }, - { "glMultiTexCoord4dv", (GLvoid *) glMultiTexCoord4dv, _gloffset_MultiTexCoord4dv }, - { "glMultiTexCoord4f", (GLvoid *) glMultiTexCoord4f, _gloffset_MultiTexCoord4f }, - { "glMultiTexCoord4fv", (GLvoid *) glMultiTexCoord4fv, _gloffset_MultiTexCoord4fv }, - { "glMultiTexCoord4i", (GLvoid *) glMultiTexCoord4i, _gloffset_MultiTexCoord4i }, - { "glMultiTexCoord4iv", (GLvoid *) glMultiTexCoord4iv, _gloffset_MultiTexCoord4iv }, - { "glMultiTexCoord4s", (GLvoid *) glMultiTexCoord4s, _gloffset_MultiTexCoord4s }, - { "glMultiTexCoord4sv", (GLvoid *) glMultiTexCoord4sv, _gloffset_MultiTexCoord4sv }, - { "glLoadTransposeMatrixf", (GLvoid *) glLoadTransposeMatrixf, _gloffset_LoadTransposeMatrixf }, - { "glLoadTransposeMatrixd", (GLvoid *) glLoadTransposeMatrixd, _gloffset_LoadTransposeMatrixd }, - { "glMultTransposeMatrixf", (GLvoid *) glMultTransposeMatrixf, _gloffset_MultTransposeMatrixf }, - { "glMultTransposeMatrixd", (GLvoid *) glMultTransposeMatrixd, _gloffset_MultTransposeMatrixd }, - { "glSampleCoverage", (GLvoid *) glSampleCoverage, _gloffset_SampleCoverage }, - { "glCompressedTexImage3D", (GLvoid *) glCompressedTexImage3D, _gloffset_CompressedTexImage3D }, - { "glCompressedTexImage2D", (GLvoid *) glCompressedTexImage2D, _gloffset_CompressedTexImage2D }, - { "glCompressedTexImage1D", (GLvoid *) glCompressedTexImage1D, _gloffset_CompressedTexImage1D }, - { "glCompressedTexSubImage3D", (GLvoid *) glCompressedTexSubImage3D, _gloffset_CompressedTexSubImage3D }, - { "glCompressedTexSubImage2D", (GLvoid *) glCompressedTexSubImage2D, _gloffset_CompressedTexSubImage2D }, - { "glCompressedTexSubImage1D", (GLvoid *) glCompressedTexSubImage1D, _gloffset_CompressedTexSubImage1D }, - { "glGetCompressedTexImage", (GLvoid *) glGetCompressedTexImage, _gloffset_GetCompressedTexImage }, - { "glActiveTextureARB", (GLvoid *) glActiveTextureARB, _gloffset_ActiveTexture }, - { "glClientActiveTextureARB", (GLvoid *) glClientActiveTextureARB, _gloffset_ClientActiveTexture }, - { "glMultiTexCoord1dARB", (GLvoid *) glMultiTexCoord1dARB, _gloffset_MultiTexCoord1d }, - { "glMultiTexCoord1dvARB", (GLvoid *) glMultiTexCoord1dvARB, _gloffset_MultiTexCoord1dv }, - { "glMultiTexCoord1fARB", (GLvoid *) glMultiTexCoord1fARB, _gloffset_MultiTexCoord1f }, - { "glMultiTexCoord1fvARB", (GLvoid *) glMultiTexCoord1fvARB, _gloffset_MultiTexCoord1fv }, - { "glMultiTexCoord1iARB", (GLvoid *) glMultiTexCoord1iARB, _gloffset_MultiTexCoord1i }, - { "glMultiTexCoord1ivARB", (GLvoid *) glMultiTexCoord1ivARB, _gloffset_MultiTexCoord1iv }, - { "glMultiTexCoord1sARB", (GLvoid *) glMultiTexCoord1sARB, _gloffset_MultiTexCoord1s }, - { "glMultiTexCoord1svARB", (GLvoid *) glMultiTexCoord1svARB, _gloffset_MultiTexCoord1sv }, - { "glMultiTexCoord2dARB", (GLvoid *) glMultiTexCoord2dARB, _gloffset_MultiTexCoord2d }, - { "glMultiTexCoord2dvARB", (GLvoid *) glMultiTexCoord2dvARB, _gloffset_MultiTexCoord2dv }, - { "glMultiTexCoord2fARB", (GLvoid *) glMultiTexCoord2fARB, _gloffset_MultiTexCoord2f }, - { "glMultiTexCoord2fvARB", (GLvoid *) glMultiTexCoord2fvARB, _gloffset_MultiTexCoord2fv }, - { "glMultiTexCoord2iARB", (GLvoid *) glMultiTexCoord2iARB, _gloffset_MultiTexCoord2i }, - { "glMultiTexCoord2ivARB", (GLvoid *) glMultiTexCoord2ivARB, _gloffset_MultiTexCoord2iv }, - { "glMultiTexCoord2sARB", (GLvoid *) glMultiTexCoord2sARB, _gloffset_MultiTexCoord2s }, - { "glMultiTexCoord2svARB", (GLvoid *) glMultiTexCoord2svARB, _gloffset_MultiTexCoord2sv }, - { "glMultiTexCoord3dARB", (GLvoid *) glMultiTexCoord3dARB, _gloffset_MultiTexCoord3d }, - { "glMultiTexCoord3dvARB", (GLvoid *) glMultiTexCoord3dvARB, _gloffset_MultiTexCoord3dv }, - { "glMultiTexCoord3fARB", (GLvoid *) glMultiTexCoord3fARB, _gloffset_MultiTexCoord3f }, - { "glMultiTexCoord3fvARB", (GLvoid *) glMultiTexCoord3fvARB, _gloffset_MultiTexCoord3fv }, - { "glMultiTexCoord3iARB", (GLvoid *) glMultiTexCoord3iARB, _gloffset_MultiTexCoord3i }, - { "glMultiTexCoord3ivARB", (GLvoid *) glMultiTexCoord3ivARB, _gloffset_MultiTexCoord3iv }, - { "glMultiTexCoord3sARB", (GLvoid *) glMultiTexCoord3sARB, _gloffset_MultiTexCoord3s }, - { "glMultiTexCoord3svARB", (GLvoid *) glMultiTexCoord3svARB, _gloffset_MultiTexCoord3sv }, - { "glMultiTexCoord4dARB", (GLvoid *) glMultiTexCoord4dARB, _gloffset_MultiTexCoord4d }, - { "glMultiTexCoord4dvARB", (GLvoid *) glMultiTexCoord4dvARB, _gloffset_MultiTexCoord4dv }, - { "glMultiTexCoord4fARB", (GLvoid *) glMultiTexCoord4fARB, _gloffset_MultiTexCoord4f }, - { "glMultiTexCoord4fvARB", (GLvoid *) glMultiTexCoord4fvARB, _gloffset_MultiTexCoord4fv }, - { "glMultiTexCoord4iARB", (GLvoid *) glMultiTexCoord4iARB, _gloffset_MultiTexCoord4i }, - { "glMultiTexCoord4ivARB", (GLvoid *) glMultiTexCoord4ivARB, _gloffset_MultiTexCoord4iv }, - { "glMultiTexCoord4sARB", (GLvoid *) glMultiTexCoord4sARB, _gloffset_MultiTexCoord4s }, - { "glMultiTexCoord4svARB", (GLvoid *) glMultiTexCoord4svARB, _gloffset_MultiTexCoord4sv }, - { "glLoadTransposeMatrixfARB", (GLvoid *) glLoadTransposeMatrixfARB, _gloffset_LoadTransposeMatrixf }, - { "glLoadTransposeMatrixdARB", (GLvoid *) glLoadTransposeMatrixdARB, _gloffset_LoadTransposeMatrixd }, - { "glMultTransposeMatrixfARB", (GLvoid *) glMultTransposeMatrixfARB, _gloffset_MultTransposeMatrixf }, - { "glMultTransposeMatrixdARB", (GLvoid *) glMultTransposeMatrixdARB, _gloffset_MultTransposeMatrixd }, - { "glSampleCoverageARB", (GLvoid *) glSampleCoverageARB, _gloffset_SampleCoverage }, - { "glCompressedTexImage3DARB", (GLvoid *) glCompressedTexImage3DARB, _gloffset_CompressedTexImage3D }, - { "glCompressedTexImage2DARB", (GLvoid *) glCompressedTexImage2DARB, _gloffset_CompressedTexImage2D }, - { "glCompressedTexImage1DARB", (GLvoid *) glCompressedTexImage1DARB, _gloffset_CompressedTexImage1D }, - { "glCompressedTexSubImage3DARB", (GLvoid *) glCompressedTexSubImage3DARB, _gloffset_CompressedTexSubImage3D }, - { "glCompressedTexSubImage2DARB", (GLvoid *) glCompressedTexSubImage2DARB, _gloffset_CompressedTexSubImage2D }, - { "glCompressedTexSubImage1DARB", (GLvoid *) glCompressedTexSubImage1DARB, _gloffset_CompressedTexSubImage1D }, - { "glGetCompressedTexImageARB", (GLvoid *) glGetCompressedTexImageARB, _gloffset_GetCompressedTexImage }, + { "glActiveTextureARB", (GLvoid *) glActiveTextureARB, _gloffset_ActiveTextureARB }, + { "glClientActiveTextureARB", (GLvoid *) glClientActiveTextureARB, _gloffset_ClientActiveTextureARB }, + { "glMultiTexCoord1dARB", (GLvoid *) glMultiTexCoord1dARB, _gloffset_MultiTexCoord1dARB }, + { "glMultiTexCoord1dvARB", (GLvoid *) glMultiTexCoord1dvARB, _gloffset_MultiTexCoord1dvARB }, + { "glMultiTexCoord1fARB", (GLvoid *) glMultiTexCoord1fARB, _gloffset_MultiTexCoord1fARB }, + { "glMultiTexCoord1fvARB", (GLvoid *) glMultiTexCoord1fvARB, _gloffset_MultiTexCoord1fvARB }, + { "glMultiTexCoord1iARB", (GLvoid *) glMultiTexCoord1iARB, _gloffset_MultiTexCoord1iARB }, + { "glMultiTexCoord1ivARB", (GLvoid *) glMultiTexCoord1ivARB, _gloffset_MultiTexCoord1ivARB }, + { "glMultiTexCoord1sARB", (GLvoid *) glMultiTexCoord1sARB, _gloffset_MultiTexCoord1sARB }, + { "glMultiTexCoord1svARB", (GLvoid *) glMultiTexCoord1svARB, _gloffset_MultiTexCoord1svARB }, + { "glMultiTexCoord2dARB", (GLvoid *) glMultiTexCoord2dARB, _gloffset_MultiTexCoord2dARB }, + { "glMultiTexCoord2dvARB", (GLvoid *) glMultiTexCoord2dvARB, _gloffset_MultiTexCoord2dvARB }, + { "glMultiTexCoord2fARB", (GLvoid *) glMultiTexCoord2fARB, _gloffset_MultiTexCoord2fARB }, + { "glMultiTexCoord2fvARB", (GLvoid *) glMultiTexCoord2fvARB, _gloffset_MultiTexCoord2fvARB }, + { "glMultiTexCoord2iARB", (GLvoid *) glMultiTexCoord2iARB, _gloffset_MultiTexCoord2iARB }, + { "glMultiTexCoord2ivARB", (GLvoid *) glMultiTexCoord2ivARB, _gloffset_MultiTexCoord2ivARB }, + { "glMultiTexCoord2sARB", (GLvoid *) glMultiTexCoord2sARB, _gloffset_MultiTexCoord2sARB }, + { "glMultiTexCoord2svARB", (GLvoid *) glMultiTexCoord2svARB, _gloffset_MultiTexCoord2svARB }, + { "glMultiTexCoord3dARB", (GLvoid *) glMultiTexCoord3dARB, _gloffset_MultiTexCoord3dARB }, + { "glMultiTexCoord3dvARB", (GLvoid *) glMultiTexCoord3dvARB, _gloffset_MultiTexCoord3dvARB }, + { "glMultiTexCoord3fARB", (GLvoid *) glMultiTexCoord3fARB, _gloffset_MultiTexCoord3fARB }, + { "glMultiTexCoord3fvARB", (GLvoid *) glMultiTexCoord3fvARB, _gloffset_MultiTexCoord3fvARB }, + { "glMultiTexCoord3iARB", (GLvoid *) glMultiTexCoord3iARB, _gloffset_MultiTexCoord3iARB }, + { "glMultiTexCoord3ivARB", (GLvoid *) glMultiTexCoord3ivARB, _gloffset_MultiTexCoord3ivARB }, + { "glMultiTexCoord3sARB", (GLvoid *) glMultiTexCoord3sARB, _gloffset_MultiTexCoord3sARB }, + { "glMultiTexCoord3svARB", (GLvoid *) glMultiTexCoord3svARB, _gloffset_MultiTexCoord3svARB }, + { "glMultiTexCoord4dARB", (GLvoid *) glMultiTexCoord4dARB, _gloffset_MultiTexCoord4dARB }, + { "glMultiTexCoord4dvARB", (GLvoid *) glMultiTexCoord4dvARB, _gloffset_MultiTexCoord4dvARB }, + { "glMultiTexCoord4fARB", (GLvoid *) glMultiTexCoord4fARB, _gloffset_MultiTexCoord4fARB }, + { "glMultiTexCoord4fvARB", (GLvoid *) glMultiTexCoord4fvARB, _gloffset_MultiTexCoord4fvARB }, + { "glMultiTexCoord4iARB", (GLvoid *) glMultiTexCoord4iARB, _gloffset_MultiTexCoord4iARB }, + { "glMultiTexCoord4ivARB", (GLvoid *) glMultiTexCoord4ivARB, _gloffset_MultiTexCoord4ivARB }, + { "glMultiTexCoord4sARB", (GLvoid *) glMultiTexCoord4sARB, _gloffset_MultiTexCoord4sARB }, + { "glMultiTexCoord4svARB", (GLvoid *) glMultiTexCoord4svARB, _gloffset_MultiTexCoord4svARB }, + { "glLoadTransposeMatrixfARB", (GLvoid *) glLoadTransposeMatrixfARB, _gloffset_LoadTransposeMatrixfARB }, + { "glLoadTransposeMatrixdARB", (GLvoid *) glLoadTransposeMatrixdARB, _gloffset_LoadTransposeMatrixdARB }, + { "glMultTransposeMatrixfARB", (GLvoid *) glMultTransposeMatrixfARB, _gloffset_MultTransposeMatrixfARB }, + { "glMultTransposeMatrixdARB", (GLvoid *) glMultTransposeMatrixdARB, _gloffset_MultTransposeMatrixdARB }, + { "glSampleCoverageARB", (GLvoid *) glSampleCoverageARB, _gloffset_SampleCoverageARB }, + { "glCompressedTexImage3DARB", (GLvoid *) glCompressedTexImage3DARB, _gloffset_CompressedTexImage3DARB }, + { "glCompressedTexImage2DARB", (GLvoid *) glCompressedTexImage2DARB, _gloffset_CompressedTexImage2DARB }, + { "glCompressedTexImage1DARB", (GLvoid *) glCompressedTexImage1DARB, _gloffset_CompressedTexImage1DARB }, + { "glCompressedTexSubImage3DARB", (GLvoid *) glCompressedTexSubImage3DARB, _gloffset_CompressedTexSubImage3DARB }, + { "glCompressedTexSubImage2DARB", (GLvoid *) glCompressedTexSubImage2DARB, _gloffset_CompressedTexSubImage2DARB }, + { "glCompressedTexSubImage1DARB", (GLvoid *) glCompressedTexSubImage1DARB, _gloffset_CompressedTexSubImage1DARB }, + { "glGetCompressedTexImageARB", (GLvoid *) glGetCompressedTexImageARB, _gloffset_GetCompressedTexImageARB }, + { "glActiveTexture", (GLvoid *) glActiveTexture, _gloffset_ActiveTextureARB }, + { "glClientActiveTexture", (GLvoid *) glClientActiveTexture, _gloffset_ClientActiveTextureARB }, + { "glMultiTexCoord1d", (GLvoid *) glMultiTexCoord1d, _gloffset_MultiTexCoord1dARB }, + { "glMultiTexCoord1dv", (GLvoid *) glMultiTexCoord1dv, _gloffset_MultiTexCoord1dvARB }, + { "glMultiTexCoord1f", (GLvoid *) glMultiTexCoord1f, _gloffset_MultiTexCoord1fARB }, + { "glMultiTexCoord1fv", (GLvoid *) glMultiTexCoord1fv, _gloffset_MultiTexCoord1fvARB }, + { "glMultiTexCoord1i", (GLvoid *) glMultiTexCoord1i, _gloffset_MultiTexCoord1iARB }, + { "glMultiTexCoord1iv", (GLvoid *) glMultiTexCoord1iv, _gloffset_MultiTexCoord1ivARB }, + { "glMultiTexCoord1s", (GLvoid *) glMultiTexCoord1s, _gloffset_MultiTexCoord1sARB }, + { "glMultiTexCoord1sv", (GLvoid *) glMultiTexCoord1sv, _gloffset_MultiTexCoord1svARB }, + { "glMultiTexCoord2d", (GLvoid *) glMultiTexCoord2d, _gloffset_MultiTexCoord2dARB }, + { "glMultiTexCoord2dv", (GLvoid *) glMultiTexCoord2dv, _gloffset_MultiTexCoord2dvARB }, + { "glMultiTexCoord2f", (GLvoid *) glMultiTexCoord2f, _gloffset_MultiTexCoord2fARB }, + { "glMultiTexCoord2fv", (GLvoid *) glMultiTexCoord2fv, _gloffset_MultiTexCoord2fvARB }, + { "glMultiTexCoord2i", (GLvoid *) glMultiTexCoord2i, _gloffset_MultiTexCoord2iARB }, + { "glMultiTexCoord2iv", (GLvoid *) glMultiTexCoord2iv, _gloffset_MultiTexCoord2ivARB }, + { "glMultiTexCoord2s", (GLvoid *) glMultiTexCoord2s, _gloffset_MultiTexCoord2sARB }, + { "glMultiTexCoord2sv", (GLvoid *) glMultiTexCoord2sv, _gloffset_MultiTexCoord2svARB }, + { "glMultiTexCoord3d", (GLvoid *) glMultiTexCoord3d, _gloffset_MultiTexCoord3dARB }, + { "glMultiTexCoord3dv", (GLvoid *) glMultiTexCoord3dv, _gloffset_MultiTexCoord3dvARB }, + { "glMultiTexCoord3f", (GLvoid *) glMultiTexCoord3f, _gloffset_MultiTexCoord3fARB }, + { "glMultiTexCoord3fv", (GLvoid *) glMultiTexCoord3fv, _gloffset_MultiTexCoord3fvARB }, + { "glMultiTexCoord3i", (GLvoid *) glMultiTexCoord3i, _gloffset_MultiTexCoord3iARB }, + { "glMultiTexCoord3iv", (GLvoid *) glMultiTexCoord3iv, _gloffset_MultiTexCoord3ivARB }, + { "glMultiTexCoord3s", (GLvoid *) glMultiTexCoord3s, _gloffset_MultiTexCoord3sARB }, + { "glMultiTexCoord3sv", (GLvoid *) glMultiTexCoord3sv, _gloffset_MultiTexCoord3svARB }, + { "glMultiTexCoord4d", (GLvoid *) glMultiTexCoord4d, _gloffset_MultiTexCoord4dARB }, + { "glMultiTexCoord4dv", (GLvoid *) glMultiTexCoord4dv, _gloffset_MultiTexCoord4dvARB }, + { "glMultiTexCoord4f", (GLvoid *) glMultiTexCoord4f, _gloffset_MultiTexCoord4fARB }, + { "glMultiTexCoord4fv", (GLvoid *) glMultiTexCoord4fv, _gloffset_MultiTexCoord4fvARB }, + { "glMultiTexCoord4i", (GLvoid *) glMultiTexCoord4i, _gloffset_MultiTexCoord4iARB }, + { "glMultiTexCoord4iv", (GLvoid *) glMultiTexCoord4iv, _gloffset_MultiTexCoord4ivARB }, + { "glMultiTexCoord4s", (GLvoid *) glMultiTexCoord4s, _gloffset_MultiTexCoord4sARB }, + { "glMultiTexCoord4sv", (GLvoid *) glMultiTexCoord4sv, _gloffset_MultiTexCoord4svARB }, + { "glLoadTransposeMatrixf", (GLvoid *) glLoadTransposeMatrixf, _gloffset_LoadTransposeMatrixfARB }, + { "glLoadTransposeMatrixd", (GLvoid *) glLoadTransposeMatrixd, _gloffset_LoadTransposeMatrixdARB }, + { "glMultTransposeMatrixf", (GLvoid *) glMultTransposeMatrixf, _gloffset_MultTransposeMatrixfARB }, + { "glMultTransposeMatrixd", (GLvoid *) glMultTransposeMatrixd, _gloffset_MultTransposeMatrixdARB }, + { "glCompressedTexImage3D", (GLvoid *) glCompressedTexImage3D, _gloffset_CompressedTexImage3DARB }, + { "glCompressedTexImage2D", (GLvoid *) glCompressedTexImage2D, _gloffset_CompressedTexImage2DARB }, + { "glCompressedTexImage1D", (GLvoid *) glCompressedTexImage1D, _gloffset_CompressedTexImage1DARB }, + { "glCompressedTexSubImage3D", (GLvoid *) glCompressedTexSubImage3D, _gloffset_CompressedTexSubImage3DARB }, + { "glCompressedTexSubImage2D", (GLvoid *) glCompressedTexSubImage2D, _gloffset_CompressedTexSubImage2DARB }, + { "glCompressedTexSubImage1D", (GLvoid *) glCompressedTexSubImage1D, _gloffset_CompressedTexSubImage1DARB }, + { "glGetCompressedTexImage", (GLvoid *) glGetCompressedTexImage, _gloffset_GetCompressedTexImageARB }, { "glBlendColorEXT", (GLvoid *) glBlendColorEXT, _gloffset_BlendColor }, { "glPolygonOffsetEXT", (GLvoid *) glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT }, { "glTexImage3DEXT", (GLvoid *) glTexImage3DEXT, _gloffset_TexImage3D }, @@ -549,12 +548,12 @@ static struct name_address_offset static_functions[] = { { "glSpriteParameterfvSGIX", (GLvoid *) glSpriteParameterfvSGIX, _gloffset_SpriteParameterfvSGIX }, { "glSpriteParameteriSGIX", (GLvoid *) glSpriteParameteriSGIX, _gloffset_SpriteParameteriSGIX }, { "glSpriteParameterivSGIX", (GLvoid *) glSpriteParameterivSGIX, _gloffset_SpriteParameterivSGIX }, - { "glPointParameterfARB", (GLvoid *) glPointParameterfARB, _gloffset_PointParameterfARB }, - { "glPointParameterfvARB", (GLvoid *) glPointParameterfvARB, _gloffset_PointParameterfvARB }, - { "glPointParameterfEXT", (GLvoid *) glPointParameterfEXT, _gloffset_PointParameterfARB }, - { "glPointParameterfvEXT", (GLvoid *) glPointParameterfvEXT, _gloffset_PointParameterfvARB }, - { "glPointParameterfSGIS", (GLvoid *) glPointParameterfSGIS, _gloffset_PointParameterfARB }, - { "glPointParameterfvSGIS", (GLvoid *) glPointParameterfvSGIS, _gloffset_PointParameterfvARB }, + { "glPointParameterfEXT", (GLvoid *) glPointParameterfEXT, _gloffset_PointParameterfEXT }, + { "glPointParameterfvEXT", (GLvoid *) glPointParameterfvEXT, _gloffset_PointParameterfvEXT }, + { "glPointParameterfARB", (GLvoid *) glPointParameterfARB, _gloffset_PointParameterfEXT }, + { "glPointParameterfvARB", (GLvoid *) glPointParameterfvARB, _gloffset_PointParameterfvEXT }, + { "glPointParameterfSGIS", (GLvoid *) glPointParameterfSGIS, _gloffset_PointParameterfEXT }, + { "glPointParameterfvSGIS", (GLvoid *) glPointParameterfvSGIS, _gloffset_PointParameterfvEXT }, { "glGetInstrumentsSGIX", (GLvoid *) glGetInstrumentsSGIX, _gloffset_GetInstrumentsSGIX }, { "glInstrumentsBufferSGIX", (GLvoid *) glInstrumentsBufferSGIX, _gloffset_InstrumentsBufferSGIX }, { "glPollInstrumentsSGIX", (GLvoid *) glPollInstrumentsSGIX, _gloffset_PollInstrumentsSGIX }, diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 66d862286eb..4beaa07d5cc 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -1,4 +1,4 @@ -/* $Id: state.c,v 1.71 2001/11/18 23:52:38 brianp Exp $ */ +/* $Id: state.c,v 1.72 2001/12/04 23:43:31 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -408,8 +408,8 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize) #endif /* 54. GL_EXT_point_parameters */ - exec->PointParameterfARB = _mesa_PointParameterfEXT; - exec->PointParameterfvARB = _mesa_PointParameterfvEXT; + exec->PointParameterfEXT = _mesa_PointParameterfEXT; + exec->PointParameterfvEXT = _mesa_PointParameterfvEXT; /* 78. GL_EXT_paletted_texture */ #if 0 @@ -457,26 +457,26 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize) exec->WindowPos4svMESA = _mesa_WindowPos4svMESA; /* ARB 1. GL_ARB_multitexture */ - exec->ActiveTexture = _mesa_ActiveTextureARB; - exec->ClientActiveTexture = _mesa_ClientActiveTextureARB; + exec->ActiveTextureARB = _mesa_ActiveTextureARB; + exec->ClientActiveTextureARB = _mesa_ClientActiveTextureARB; /* ARB 3. GL_ARB_transpose_matrix */ - exec->LoadTransposeMatrixd = _mesa_LoadTransposeMatrixdARB; - exec->LoadTransposeMatrixf = _mesa_LoadTransposeMatrixfARB; - exec->MultTransposeMatrixd = _mesa_MultTransposeMatrixdARB; - exec->MultTransposeMatrixf = _mesa_MultTransposeMatrixfARB; + exec->LoadTransposeMatrixdARB = _mesa_LoadTransposeMatrixdARB; + exec->LoadTransposeMatrixfARB = _mesa_LoadTransposeMatrixfARB; + exec->MultTransposeMatrixdARB = _mesa_MultTransposeMatrixdARB; + exec->MultTransposeMatrixfARB = _mesa_MultTransposeMatrixfARB; /* ARB 5. GL_ARB_multisample */ - exec->SampleCoverage = _mesa_SampleCoverageARB; + exec->SampleCoverageARB = _mesa_SampleCoverageARB; /* ARB 12. GL_ARB_texture_compression */ - exec->CompressedTexImage3D = _mesa_CompressedTexImage3DARB; - exec->CompressedTexImage2D = _mesa_CompressedTexImage2DARB; - exec->CompressedTexImage1D = _mesa_CompressedTexImage1DARB; - exec->CompressedTexSubImage3D = _mesa_CompressedTexSubImage3DARB; - exec->CompressedTexSubImage2D = _mesa_CompressedTexSubImage2DARB; - exec->CompressedTexSubImage1D = _mesa_CompressedTexSubImage1DARB; - exec->GetCompressedTexImage = _mesa_GetCompressedTexImageARB; + exec->CompressedTexImage3DARB = _mesa_CompressedTexImage3DARB; + exec->CompressedTexImage2DARB = _mesa_CompressedTexImage2DARB; + exec->CompressedTexImage1DARB = _mesa_CompressedTexImage1DARB; + exec->CompressedTexSubImage3DARB = _mesa_CompressedTexSubImage3DARB; + exec->CompressedTexSubImage2DARB = _mesa_CompressedTexSubImage2DARB; + exec->CompressedTexSubImage1DARB = _mesa_CompressedTexSubImage1DARB; + exec->GetCompressedTexImageARB = _mesa_GetCompressedTexImageARB; /* GL_ARB_window_pos */ exec->WindowPos2dARB = _mesa_WindowPos2dARB; diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c index 9df1b52a897..73f54a0b409 100644 --- a/src/mesa/main/vtxfmt.c +++ b/src/mesa/main/vtxfmt.c @@ -1,8 +1,8 @@ -/* $Id: vtxfmt.c,v 1.7 2001/11/18 22:48:13 brianp Exp $ */ +/* $Id: vtxfmt.c,v 1.8 2001/12/04 23:43:31 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 4.1 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * @@ -55,17 +55,15 @@ if ( new_state ) \ _mesa_update_state( ctx ); \ \ - /* Validate the current tnl module. \ - */ \ + /* Validate the current tnl module. */ \ if ( new_state & ctx->Driver.NeedValidate ) \ ctx->Driver.ValidateTnlModule( ctx, new_state ); \ \ ASSERT( tnl->Current ); \ ASSERT( tnl->SwapCount < NUM_VERTEX_FORMAT_ENTRIES ); \ \ - /* Save the swapped function's dispatch entry so it can be \ - * restored later. \ - */ \ + /* Save the swapped function's dispatch entry so it can be */ \ + /* restored later. */ \ tnl->Swapped[tnl->SwapCount][0] = (void *)&(ctx->Exec->FUNC); \ tnl->Swapped[tnl->SwapCount][1] = (void *)TAG(FUNC); \ tnl->SwapCount++; \ @@ -73,8 +71,7 @@ if ( 0 ) \ fprintf( stderr, " swapping gl" #FUNC"...\n" ); \ \ - /* Install the tnl function pointer. \ - */ \ + /* Install the tnl function pointer. */ \ ctx->Exec->FUNC = tnl->Current->FUNC; \ } @@ -107,14 +104,14 @@ static void install_vtxfmt( struct _glapi_table *tab, GLvertexformat *vfmt ) tab->Indexi = vfmt->Indexi; tab->Indexiv = vfmt->Indexiv; tab->Materialfv = vfmt->Materialfv; - tab->MultiTexCoord1f = vfmt->MultiTexCoord1f; - tab->MultiTexCoord1fv = vfmt->MultiTexCoord1fv; - tab->MultiTexCoord2f = vfmt->MultiTexCoord2f; - tab->MultiTexCoord2fv = vfmt->MultiTexCoord2fv; - tab->MultiTexCoord3f = vfmt->MultiTexCoord3f; - tab->MultiTexCoord3fv = vfmt->MultiTexCoord3fv; - tab->MultiTexCoord4f = vfmt->MultiTexCoord4f; - tab->MultiTexCoord4fv = vfmt->MultiTexCoord4fv; + tab->MultiTexCoord1fARB = vfmt->MultiTexCoord1fARB; + tab->MultiTexCoord1fvARB = vfmt->MultiTexCoord1fvARB; + tab->MultiTexCoord2fARB = vfmt->MultiTexCoord2fARB; + tab->MultiTexCoord2fvARB = vfmt->MultiTexCoord2fvARB; + tab->MultiTexCoord3fARB = vfmt->MultiTexCoord3fARB; + tab->MultiTexCoord3fvARB = vfmt->MultiTexCoord3fvARB; + tab->MultiTexCoord4fARB = vfmt->MultiTexCoord4fARB; + tab->MultiTexCoord4fvARB = vfmt->MultiTexCoord4fvARB; tab->Normal3f = vfmt->Normal3f; tab->Normal3fv = vfmt->Normal3fv; tab->SecondaryColor3fEXT = vfmt->SecondaryColor3fEXT; diff --git a/src/mesa/main/vtxfmt_tmp.h b/src/mesa/main/vtxfmt_tmp.h index 010ebc46c76..59a8b441ac4 100644 --- a/src/mesa/main/vtxfmt_tmp.h +++ b/src/mesa/main/vtxfmt_tmp.h @@ -1,4 +1,4 @@ -/* $Id: vtxfmt_tmp.h,v 1.6 2001/11/27 00:05:35 brianp Exp $ */ +/* $Id: vtxfmt_tmp.h,v 1.7 2001/12/04 23:43:31 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -34,109 +34,109 @@ static void TAG(ArrayElement)( GLint i ) { PRE_LOOPBACK( ArrayElement ); - glArrayElement( i ); + _glapi_Dispatch->ArrayElement( i ); } -static void TAG(Color3f)( GLfloat a, GLfloat b, GLfloat c ) +static void TAG(Color3f)( GLfloat r, GLfloat g, GLfloat b ) { PRE_LOOPBACK( Color3f ); - glColor3f( a, b, c ); + _glapi_Dispatch->Color3f( r, g, b ); } static void TAG(Color3fv)( const GLfloat *v ) { PRE_LOOPBACK( Color3fv ); - glColor3fv( v ); + _glapi_Dispatch->Color3fv( v ); } -static void TAG(Color3ub)( GLubyte a, GLubyte b, GLubyte c ) +static void TAG(Color3ub)( GLubyte r, GLubyte g, GLubyte b ) { PRE_LOOPBACK( Color3ub ); - glColor3ub( a, b, c ); + _glapi_Dispatch->Color3ub( r, g, b ); } static void TAG(Color3ubv)( const GLubyte *v ) { PRE_LOOPBACK( Color3ubv ); - glColor3ubv( v ); + _glapi_Dispatch->Color3ubv( v ); } -static void TAG(Color4f)( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) +static void TAG(Color4f)( GLfloat r, GLfloat g, GLfloat b, GLfloat a ) { PRE_LOOPBACK( Color4f ); - glColor4f( a, b, c, d ); + _glapi_Dispatch->Color4f( r, g, b, a ); } static void TAG(Color4fv)( const GLfloat *v ) { PRE_LOOPBACK( Color4fv ); - glColor4fv( v ); + _glapi_Dispatch->Color4fv( v ); } -static void TAG(Color4ub)( GLubyte a, GLubyte b, GLubyte c, GLubyte d ) +static void TAG(Color4ub)( GLubyte r, GLubyte g, GLubyte b, GLubyte a ) { PRE_LOOPBACK( Color4ub ); - glColor4ub( a, b, c, d ); + _glapi_Dispatch->Color4ub( r, g, b, a ); } static void TAG(Color4ubv)( const GLubyte *v ) { PRE_LOOPBACK( Color4ubv ); - glColor4ubv( v ); + _glapi_Dispatch->Color4ubv( v ); } -static void TAG(EdgeFlag)( GLboolean a ) +static void TAG(EdgeFlag)( GLboolean e ) { PRE_LOOPBACK( EdgeFlag ); - glEdgeFlag( a ); + _glapi_Dispatch->EdgeFlag( e ); } static void TAG(EdgeFlagv)( const GLboolean *v ) { PRE_LOOPBACK( EdgeFlagv ); - glEdgeFlagv( v ); + _glapi_Dispatch->EdgeFlagv( v ); } -static void TAG(EvalCoord1f)( GLfloat a ) +static void TAG(EvalCoord1f)( GLfloat s ) { PRE_LOOPBACK( EvalCoord1f ); - glEvalCoord1f( a ); + _glapi_Dispatch->EvalCoord1f( s ); } static void TAG(EvalCoord1fv)( const GLfloat *v ) { PRE_LOOPBACK( EvalCoord1fv ); - glEvalCoord1fv( v ); + _glapi_Dispatch->EvalCoord1fv( v ); } -static void TAG(EvalCoord2f)( GLfloat a, GLfloat b ) +static void TAG(EvalCoord2f)( GLfloat s, GLfloat t ) { PRE_LOOPBACK( EvalCoord2f ); - glEvalCoord2f( a, b ); + _glapi_Dispatch->EvalCoord2f( s, t ); } static void TAG(EvalCoord2fv)( const GLfloat *v ) { PRE_LOOPBACK( EvalCoord2fv ); - glEvalCoord2fv( v ); + _glapi_Dispatch->EvalCoord2fv( v ); } -static void TAG(EvalPoint1)( GLint a ) +static void TAG(EvalPoint1)( GLint i ) { PRE_LOOPBACK( EvalPoint1 ); - glEvalPoint1( a ); + _glapi_Dispatch->EvalPoint1( i ); } -static void TAG(EvalPoint2)( GLint a, GLint b ) +static void TAG(EvalPoint2)( GLint i, GLint j ) { PRE_LOOPBACK( EvalPoint2 ); - glEvalPoint2( a, b ); + _glapi_Dispatch->EvalPoint2( i, j ); } -static void TAG(FogCoordfEXT)( GLfloat a ) +static void TAG(FogCoordfEXT)( GLfloat f ) { PRE_LOOPBACK( FogCoordfEXT ); - _glapi_Dispatch->FogCoordfEXT( a ); + _glapi_Dispatch->FogCoordfEXT( f ); } static void TAG(FogCoordfvEXT)( const GLfloat *v ) @@ -145,90 +145,90 @@ static void TAG(FogCoordfvEXT)( const GLfloat *v ) _glapi_Dispatch->FogCoordfvEXT( v ); } -static void TAG(Indexi)( GLint a ) +static void TAG(Indexi)( GLint i ) { PRE_LOOPBACK( Indexi ); - glIndexi( a ); + _glapi_Dispatch->Indexi( i ); } static void TAG(Indexiv)( const GLint *v ) { PRE_LOOPBACK( Indexiv ); - glIndexiv( v ); + _glapi_Dispatch->Indexiv( v ); } static void TAG(Materialfv)( GLenum face, GLenum pname, const GLfloat *v ) { PRE_LOOPBACK( Materialfv ); - glMaterialfv( face, pname, v ); + _glapi_Dispatch->Materialfv( face, pname, v ); } -static void TAG(MultiTexCoord1f)( GLenum target, GLfloat a ) +static void TAG(MultiTexCoord1fARB)( GLenum target, GLfloat a ) { - PRE_LOOPBACK( MultiTexCoord1f ); - glMultiTexCoord1f( target, a ); + PRE_LOOPBACK( MultiTexCoord1fARB ); + _glapi_Dispatch->MultiTexCoord1fARB( target, a ); } -static void TAG(MultiTexCoord1fv)( GLenum target, const GLfloat *tc ) +static void TAG(MultiTexCoord1fvARB)( GLenum target, const GLfloat *tc ) { - PRE_LOOPBACK( MultiTexCoord1fv ); - glMultiTexCoord1fv( target, tc ); + PRE_LOOPBACK( MultiTexCoord1fvARB ); + _glapi_Dispatch->MultiTexCoord1fvARB( target, tc ); } -static void TAG(MultiTexCoord2f)( GLenum target, GLfloat a, GLfloat b ) +static void TAG(MultiTexCoord2fARB)( GLenum target, GLfloat s, GLfloat t ) { - PRE_LOOPBACK( MultiTexCoord2f ); - glMultiTexCoord2f( target, a, b ); + PRE_LOOPBACK( MultiTexCoord2fARB ); + _glapi_Dispatch->MultiTexCoord2fARB( target, s, t ); } -static void TAG(MultiTexCoord2fv)( GLenum target, const GLfloat *tc ) +static void TAG(MultiTexCoord2fvARB)( GLenum target, const GLfloat *tc ) { - PRE_LOOPBACK( MultiTexCoord2fv ); - glMultiTexCoord2fv( target, tc ); + PRE_LOOPBACK( MultiTexCoord2fvARB ); + _glapi_Dispatch->MultiTexCoord2fvARB( target, tc ); } -static void TAG(MultiTexCoord3f)( GLenum target, GLfloat a, - GLfloat b, GLfloat c ) +static void TAG(MultiTexCoord3fARB)( GLenum target, GLfloat s, + GLfloat t, GLfloat r ) { - PRE_LOOPBACK( MultiTexCoord3f ); - glMultiTexCoord3f( target, a, b, c ); + PRE_LOOPBACK( MultiTexCoord3fARB ); + _glapi_Dispatch->MultiTexCoord3fARB( target, s, t, r ); } -static void TAG(MultiTexCoord3fv)( GLenum target, const GLfloat *tc ) +static void TAG(MultiTexCoord3fvARB)( GLenum target, const GLfloat *tc ) { - PRE_LOOPBACK( MultiTexCoord3fv ); - glMultiTexCoord3fv( target, tc ); + PRE_LOOPBACK( MultiTexCoord3fvARB ); + _glapi_Dispatch->MultiTexCoord3fvARB( target, tc ); } -static void TAG(MultiTexCoord4f)( GLenum target, GLfloat a, - GLfloat b, GLfloat c, GLfloat d ) +static void TAG(MultiTexCoord4fARB)( GLenum target, GLfloat s, + GLfloat t, GLfloat r, GLfloat q ) { - PRE_LOOPBACK( MultiTexCoord4f ); - glMultiTexCoord4f( target, a, b, c, d ); + PRE_LOOPBACK( MultiTexCoord4fARB ); + _glapi_Dispatch->MultiTexCoord4fARB( target, s, t, r, q ); } -static void TAG(MultiTexCoord4fv)( GLenum target, const GLfloat *tc ) +static void TAG(MultiTexCoord4fvARB)( GLenum target, const GLfloat *tc ) { - PRE_LOOPBACK( MultiTexCoord4fv ); - glMultiTexCoord4fv( target, tc ); + PRE_LOOPBACK( MultiTexCoord4fvARB ); + _glapi_Dispatch->MultiTexCoord4fvARB( target, tc ); } -static void TAG(Normal3f)( GLfloat a, GLfloat b, GLfloat c ) +static void TAG(Normal3f)( GLfloat x, GLfloat y, GLfloat z ) { PRE_LOOPBACK( Normal3f ); - glNormal3f( a, b, c ); + _glapi_Dispatch->Normal3f( x, y, z ); } static void TAG(Normal3fv)( const GLfloat *v ) { PRE_LOOPBACK( Normal3fv ); - glNormal3fv( v ); + _glapi_Dispatch->Normal3fv( v ); } -static void TAG(SecondaryColor3fEXT)( GLfloat a, GLfloat b, GLfloat c ) +static void TAG(SecondaryColor3fEXT)( GLfloat r, GLfloat g, GLfloat b ) { PRE_LOOPBACK( SecondaryColor3fEXT ); - _glapi_Dispatch->SecondaryColor3fEXT( a, b, c ); + _glapi_Dispatch->SecondaryColor3fEXT( r, g, b ); } static void TAG(SecondaryColor3fvEXT)( const GLfloat *v ) @@ -237,10 +237,10 @@ static void TAG(SecondaryColor3fvEXT)( const GLfloat *v ) _glapi_Dispatch->SecondaryColor3fvEXT( v ); } -static void TAG(SecondaryColor3ubEXT)( GLubyte a, GLubyte b, GLubyte c ) +static void TAG(SecondaryColor3ubEXT)( GLubyte r, GLubyte g, GLubyte b ) { PRE_LOOPBACK( SecondaryColor3ubEXT ); - _glapi_Dispatch->SecondaryColor3ubEXT( a, b, c ); + _glapi_Dispatch->SecondaryColor3ubEXT( r, g, b ); } static void TAG(SecondaryColor3ubvEXT)( const GLubyte *v ) @@ -249,125 +249,125 @@ static void TAG(SecondaryColor3ubvEXT)( const GLubyte *v ) _glapi_Dispatch->SecondaryColor3ubvEXT( v ); } -static void TAG(TexCoord1f)( GLfloat a ) +static void TAG(TexCoord1f)( GLfloat s ) { PRE_LOOPBACK( TexCoord1f ); - glTexCoord1f( a ); + _glapi_Dispatch->TexCoord1f( s ); } static void TAG(TexCoord1fv)( const GLfloat *tc ) { PRE_LOOPBACK( TexCoord1fv ); - glTexCoord1fv( tc ); + _glapi_Dispatch->TexCoord1fv( tc ); } -static void TAG(TexCoord2f)( GLfloat a, GLfloat b ) +static void TAG(TexCoord2f)( GLfloat s, GLfloat t ) { PRE_LOOPBACK( TexCoord2f ); - glTexCoord2f( a, b ); + _glapi_Dispatch->TexCoord2f( s, t ); } static void TAG(TexCoord2fv)( const GLfloat *tc ) { PRE_LOOPBACK( TexCoord2fv ); - glTexCoord2fv( tc ); + _glapi_Dispatch->TexCoord2fv( tc ); } -static void TAG(TexCoord3f)( GLfloat a, GLfloat b, GLfloat c ) +static void TAG(TexCoord3f)( GLfloat s, GLfloat t, GLfloat r ) { PRE_LOOPBACK( TexCoord3f ); - glTexCoord3f( a, b, c ); + _glapi_Dispatch->TexCoord3f( s, t, r ); } static void TAG(TexCoord3fv)( const GLfloat *tc ) { PRE_LOOPBACK( TexCoord3fv ); - glTexCoord3fv( tc ); + _glapi_Dispatch->TexCoord3fv( tc ); } -static void TAG(TexCoord4f)( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) +static void TAG(TexCoord4f)( GLfloat s, GLfloat t, GLfloat r, GLfloat q ) { PRE_LOOPBACK( TexCoord4f ); - glTexCoord4f( a, b, c, d ); + _glapi_Dispatch->TexCoord4f( s, t, r, q ); } static void TAG(TexCoord4fv)( const GLfloat *tc ) { PRE_LOOPBACK( TexCoord4fv ); - glTexCoord4fv( tc ); + _glapi_Dispatch->TexCoord4fv( tc ); } -static void TAG(Vertex2f)( GLfloat a, GLfloat b ) +static void TAG(Vertex2f)( GLfloat x, GLfloat y ) { PRE_LOOPBACK( Vertex2f ); - glVertex2f( a, b ); + _glapi_Dispatch->Vertex2f( x, y ); } -static void TAG(Vertex2fv)( const GLfloat *obj ) +static void TAG(Vertex2fv)( const GLfloat *v ) { PRE_LOOPBACK( Vertex2fv ); - glVertex2fv( obj ); + _glapi_Dispatch->Vertex2fv( v ); } -static void TAG(Vertex3f)( GLfloat a, GLfloat b, GLfloat c ) +static void TAG(Vertex3f)( GLfloat x, GLfloat y, GLfloat z ) { PRE_LOOPBACK( Vertex3f ); - glVertex3f( a, b, c ); + _glapi_Dispatch->Vertex3f( x, y, z ); } -static void TAG(Vertex3fv)( const GLfloat *obj ) +static void TAG(Vertex3fv)( const GLfloat *v ) { PRE_LOOPBACK( Vertex3fv ); - glVertex3fv( obj ); + _glapi_Dispatch->Vertex3fv( v ); } -static void TAG(Vertex4f)( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) +static void TAG(Vertex4f)( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) { PRE_LOOPBACK( Vertex4f ); - glVertex4f( a, b, c, d ); + _glapi_Dispatch->Vertex4f( x, y, z, w ); } -static void TAG(Vertex4fv)( const GLfloat *obj ) +static void TAG(Vertex4fv)( const GLfloat *v ) { PRE_LOOPBACK( Vertex4fv ); - glVertex4fv( obj ); + _glapi_Dispatch->Vertex4fv( v ); } static void TAG(CallList)( GLuint i ) { PRE_LOOPBACK( CallList ); - glCallList( i ); + _glapi_Dispatch->CallList( i ); } static void TAG(Begin)( GLenum mode ) { PRE_LOOPBACK( Begin ); - glBegin( mode ); + _glapi_Dispatch->Begin( mode ); } static void TAG(End)( void ) { PRE_LOOPBACK( End ); - glEnd(); + _glapi_Dispatch->End(); } static void TAG(Rectf)( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ) { PRE_LOOPBACK( Rectf ); - glRectf( x1, y1, x2, y2 ); + _glapi_Dispatch->Rectf( x1, y1, x2, y2 ); } static void TAG(DrawArrays)( GLenum mode, GLint start, GLsizei count ) { PRE_LOOPBACK( DrawArrays ); - glDrawArrays( mode, start, count ); + _glapi_Dispatch->DrawArrays( mode, start, count ); } static void TAG(DrawElements)( GLenum mode, GLsizei count, GLenum type, const void *indices ) { PRE_LOOPBACK( DrawElements ); - glDrawElements( mode, count, type, indices ); + _glapi_Dispatch->DrawElements( mode, count, type, indices ); } static void TAG(DrawRangeElements)( GLenum mode, GLuint start, @@ -375,20 +375,20 @@ static void TAG(DrawRangeElements)( GLenum mode, GLuint start, GLenum type, const void *indices ) { PRE_LOOPBACK( DrawRangeElements ); - glDrawRangeElements( mode, start, end, count, type, indices ); + _glapi_Dispatch->DrawRangeElements( mode, start, end, count, type, indices ); } static void TAG(EvalMesh1)( GLenum mode, GLint i1, GLint i2 ) { PRE_LOOPBACK( EvalMesh1 ); - glEvalMesh1( mode, i1, i2 ); + _glapi_Dispatch->EvalMesh1( mode, i1, i2 ); } static void TAG(EvalMesh2)( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 ) { PRE_LOOPBACK( EvalMesh2 ); - glEvalMesh2( mode, i1, i2, j1, j2 ); + _glapi_Dispatch->EvalMesh2( mode, i1, i2, j1, j2 ); } @@ -415,14 +415,14 @@ static GLvertexformat TAG(vtxfmt) = { TAG(Indexi), TAG(Indexiv), TAG(Materialfv), - TAG(MultiTexCoord1f), - TAG(MultiTexCoord1fv), - TAG(MultiTexCoord2f), - TAG(MultiTexCoord2fv), - TAG(MultiTexCoord3f), - TAG(MultiTexCoord3fv), - TAG(MultiTexCoord4f), - TAG(MultiTexCoord4fv), + TAG(MultiTexCoord1fARB), + TAG(MultiTexCoord1fvARB), + TAG(MultiTexCoord2fARB), + TAG(MultiTexCoord2fvARB), + TAG(MultiTexCoord3fARB), + TAG(MultiTexCoord3fvARB), + TAG(MultiTexCoord4fARB), + TAG(MultiTexCoord4fvARB), TAG(Normal3f), TAG(Normal3fv), TAG(SecondaryColor3fEXT), |