diff options
| -rw-r--r-- | src/mesa/main/api_arrayelt.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/api_arrayelt.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/api_loopback.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/api_noop.c | 118 | ||||
| -rw-r--r-- | src/mesa/main/api_noop.h | 118 | ||||
| -rw-r--r-- | src/mesa/main/dlist.c | 108 |
6 files changed, 175 insertions, 175 deletions
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 68e263ea1bb..aefeadf228a 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -337,7 +337,7 @@ static void _ae_update_state( GLcontext *ctx ) } -void _ae_loopback_array_elt( GLint elt ) +void GLAPIENTRY _ae_loopback_array_elt( GLint elt ) { GET_CURRENT_CONTEXT(ctx); AEcontext *actx = AE_CONTEXT(ctx); diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h index 706a72308c5..1c0af9f3ea8 100644 --- a/src/mesa/main/api_arrayelt.h +++ b/src/mesa/main/api_arrayelt.h @@ -32,6 +32,6 @@ extern GLboolean _ae_create_context( GLcontext *ctx ); extern void _ae_destroy_context( GLcontext *ctx ); extern void _ae_invalidate_state( GLcontext *ctx, GLuint new_state ); -extern void _ae_loopback_array_elt( GLint elt ); +extern void GLAPIENTRY _ae_loopback_array_elt( GLint elt ); #endif diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c index c163d668fdd..33e7ee8e712 100644 --- a/src/mesa/main/api_loopback.c +++ b/src/mesa/main/api_loopback.c @@ -218,7 +218,7 @@ loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) ); } -static void +static void GLAPIENTRY loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) { COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c index e60720fff52..bde37e70e3d 100644 --- a/src/mesa/main/api_noop.c +++ b/src/mesa/main/api_noop.c @@ -43,31 +43,31 @@ * currently enabled hardware vertex. * */ -void _mesa_noop_EdgeFlag( GLboolean b ) +void GLAPIENTRY _mesa_noop_EdgeFlag( GLboolean b ) { GET_CURRENT_CONTEXT(ctx); ctx->Current.EdgeFlag = b; } -void _mesa_noop_EdgeFlagv( const GLboolean *b ) +void GLAPIENTRY _mesa_noop_EdgeFlagv( const GLboolean *b ) { GET_CURRENT_CONTEXT(ctx); ctx->Current.EdgeFlag = *b; } -void _mesa_noop_Indexf( GLfloat f ) +void GLAPIENTRY _mesa_noop_Indexf( GLfloat f ) { GET_CURRENT_CONTEXT(ctx); ctx->Current.Index = f; } -void _mesa_noop_Indexfv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_Indexfv( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); ctx->Current.Index = *v; } -void _mesa_noop_FogCoordfEXT( GLfloat a ) +void GLAPIENTRY _mesa_noop_FogCoordfEXT( GLfloat a ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_FOG]; @@ -77,7 +77,7 @@ void _mesa_noop_FogCoordfEXT( GLfloat a ) dest[3] = 1.0; } -void _mesa_noop_FogCoordfvEXT( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_FogCoordfvEXT( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL]; @@ -87,7 +87,7 @@ void _mesa_noop_FogCoordfvEXT( const GLfloat *v ) dest[3] = 1.0; } -void _mesa_noop_Normal3f( GLfloat a, GLfloat b, GLfloat c ) +void GLAPIENTRY _mesa_noop_Normal3f( GLfloat a, GLfloat b, GLfloat c ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL]; @@ -97,7 +97,7 @@ void _mesa_noop_Normal3f( GLfloat a, GLfloat b, GLfloat c ) dest[3] = 1.0; } -void _mesa_noop_Normal3fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_Normal3fv( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL]; @@ -107,7 +107,7 @@ void _mesa_noop_Normal3fv( const GLfloat *v ) dest[3] = 1.0; } -void _mesa_noop_Color4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) +void GLAPIENTRY _mesa_noop_Color4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) { GET_CURRENT_CONTEXT(ctx); GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0]; @@ -117,7 +117,7 @@ void _mesa_noop_Color4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) color[3] = d; } -void _mesa_noop_Color4fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_Color4fv( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0]; @@ -127,7 +127,7 @@ void _mesa_noop_Color4fv( const GLfloat *v ) color[3] = v[3]; } -void _mesa_noop_Color3f( GLfloat a, GLfloat b, GLfloat c ) +void GLAPIENTRY _mesa_noop_Color3f( GLfloat a, GLfloat b, GLfloat c ) { GET_CURRENT_CONTEXT(ctx); GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0]; @@ -137,7 +137,7 @@ void _mesa_noop_Color3f( GLfloat a, GLfloat b, GLfloat c ) color[3] = 1.0; } -void _mesa_noop_Color3fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_Color3fv( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0]; @@ -147,7 +147,7 @@ void _mesa_noop_Color3fv( const GLfloat *v ) color[3] = 1.0; } -void _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a ) +void GLAPIENTRY _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a ) { GET_CURRENT_CONTEXT(ctx); GLuint unit = target - GL_TEXTURE0_ARB; @@ -164,7 +164,7 @@ void _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a ) } } -void _mesa_noop_MultiTexCoord1fvARB( GLenum target, const GLfloat *v ) +void GLAPIENTRY _mesa_noop_MultiTexCoord1fvARB( GLenum target, const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLuint unit = target - GL_TEXTURE0_ARB; @@ -181,7 +181,7 @@ void _mesa_noop_MultiTexCoord1fvARB( GLenum target, const GLfloat *v ) } } -void _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, GLfloat b ) +void GLAPIENTRY _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, GLfloat b ) { GET_CURRENT_CONTEXT(ctx); GLuint unit = target - GL_TEXTURE0_ARB; @@ -198,7 +198,7 @@ void _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, GLfloat b ) } } -void _mesa_noop_MultiTexCoord2fvARB( GLenum target, const GLfloat *v ) +void GLAPIENTRY _mesa_noop_MultiTexCoord2fvARB( GLenum target, const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLuint unit = target - GL_TEXTURE0_ARB; @@ -215,7 +215,7 @@ void _mesa_noop_MultiTexCoord2fvARB( GLenum target, const GLfloat *v ) } } -void _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c) +void GLAPIENTRY _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c) { GET_CURRENT_CONTEXT(ctx); GLuint unit = target - GL_TEXTURE0_ARB; @@ -232,7 +232,7 @@ void _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, GLfloat b, GLfloat } } -void _mesa_noop_MultiTexCoord3fvARB( GLenum target, const GLfloat *v ) +void GLAPIENTRY _mesa_noop_MultiTexCoord3fvARB( GLenum target, const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLuint unit = target - GL_TEXTURE0_ARB; @@ -249,7 +249,7 @@ void _mesa_noop_MultiTexCoord3fvARB( GLenum target, const GLfloat *v ) } } -void _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, GLfloat b, +void GLAPIENTRY _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c, GLfloat d ) { GET_CURRENT_CONTEXT(ctx); @@ -267,7 +267,7 @@ void _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, GLfloat b, } } -void _mesa_noop_MultiTexCoord4fvARB( GLenum target, const GLfloat *v ) +void GLAPIENTRY _mesa_noop_MultiTexCoord4fvARB( GLenum target, const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLuint unit = target - GL_TEXTURE0_ARB; @@ -284,7 +284,7 @@ void _mesa_noop_MultiTexCoord4fvARB( GLenum target, const GLfloat *v ) } } -void _mesa_noop_SecondaryColor3fEXT( GLfloat a, GLfloat b, GLfloat c ) +void GLAPIENTRY _mesa_noop_SecondaryColor3fEXT( GLfloat a, GLfloat b, GLfloat c ) { GET_CURRENT_CONTEXT(ctx); GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR1]; @@ -294,7 +294,7 @@ void _mesa_noop_SecondaryColor3fEXT( GLfloat a, GLfloat b, GLfloat c ) color[3] = 1.0; } -void _mesa_noop_SecondaryColor3fvEXT( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_SecondaryColor3fvEXT( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR1]; @@ -304,7 +304,7 @@ void _mesa_noop_SecondaryColor3fvEXT( const GLfloat *v ) color[3] = 1.0; } -void _mesa_noop_TexCoord1f( GLfloat a ) +void GLAPIENTRY _mesa_noop_TexCoord1f( GLfloat a ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0]; @@ -314,7 +314,7 @@ void _mesa_noop_TexCoord1f( GLfloat a ) dest[3] = 1; } -void _mesa_noop_TexCoord1fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_TexCoord1fv( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0]; @@ -324,7 +324,7 @@ void _mesa_noop_TexCoord1fv( const GLfloat *v ) dest[3] = 1; } -void _mesa_noop_TexCoord2f( GLfloat a, GLfloat b ) +void GLAPIENTRY _mesa_noop_TexCoord2f( GLfloat a, GLfloat b ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0]; @@ -334,7 +334,7 @@ void _mesa_noop_TexCoord2f( GLfloat a, GLfloat b ) dest[3] = 1; } -void _mesa_noop_TexCoord2fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_TexCoord2fv( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0]; @@ -344,7 +344,7 @@ void _mesa_noop_TexCoord2fv( const GLfloat *v ) dest[3] = 1; } -void _mesa_noop_TexCoord3f( GLfloat a, GLfloat b, GLfloat c ) +void GLAPIENTRY _mesa_noop_TexCoord3f( GLfloat a, GLfloat b, GLfloat c ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0]; @@ -354,7 +354,7 @@ void _mesa_noop_TexCoord3f( GLfloat a, GLfloat b, GLfloat c ) dest[3] = 1; } -void _mesa_noop_TexCoord3fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_TexCoord3fv( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0]; @@ -364,7 +364,7 @@ void _mesa_noop_TexCoord3fv( const GLfloat *v ) dest[3] = 1; } -void _mesa_noop_TexCoord4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) +void GLAPIENTRY _mesa_noop_TexCoord4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0]; @@ -374,7 +374,7 @@ void _mesa_noop_TexCoord4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) dest[3] = d; } -void _mesa_noop_TexCoord4fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_TexCoord4fv( const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0]; @@ -386,7 +386,7 @@ void _mesa_noop_TexCoord4fv( const GLfloat *v ) -void _mesa_noop_VertexAttrib1fNV( GLuint index, GLfloat x ) +void GLAPIENTRY _mesa_noop_VertexAttrib1fNV( GLuint index, GLfloat x ) { GET_CURRENT_CONTEXT(ctx); if (index < VERT_ATTRIB_MAX) { @@ -396,7 +396,7 @@ void _mesa_noop_VertexAttrib1fNV( GLuint index, GLfloat x ) _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib1f" ); } -void _mesa_noop_VertexAttrib1fvNV( GLuint index, const GLfloat *v ) +void GLAPIENTRY _mesa_noop_VertexAttrib1fvNV( GLuint index, const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); if (index < VERT_ATTRIB_MAX) { @@ -406,7 +406,7 @@ void _mesa_noop_VertexAttrib1fvNV( GLuint index, const GLfloat *v ) _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib1fv" ); } -void _mesa_noop_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ) +void GLAPIENTRY _mesa_noop_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ) { GET_CURRENT_CONTEXT(ctx); if (index < VERT_ATTRIB_MAX) { @@ -416,7 +416,7 @@ void _mesa_noop_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ) _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib2f" ); } -void _mesa_noop_VertexAttrib2fvNV( GLuint index, const GLfloat *v ) +void GLAPIENTRY _mesa_noop_VertexAttrib2fvNV( GLuint index, const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); if (index < VERT_ATTRIB_MAX) { @@ -426,7 +426,7 @@ void _mesa_noop_VertexAttrib2fvNV( GLuint index, const GLfloat *v ) _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib2fv" ); } -void _mesa_noop_VertexAttrib3fNV( GLuint index, GLfloat x, +void GLAPIENTRY _mesa_noop_VertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, GLfloat z ) { GET_CURRENT_CONTEXT(ctx); @@ -437,7 +437,7 @@ void _mesa_noop_VertexAttrib3fNV( GLuint index, GLfloat x, _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib3f" ); } -void _mesa_noop_VertexAttrib3fvNV( GLuint index, const GLfloat *v ) +void GLAPIENTRY _mesa_noop_VertexAttrib3fvNV( GLuint index, const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); if (index < VERT_ATTRIB_MAX) { @@ -447,7 +447,7 @@ void _mesa_noop_VertexAttrib3fvNV( GLuint index, const GLfloat *v ) _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib3fv" ); } -void _mesa_noop_VertexAttrib4fNV( GLuint index, GLfloat x, +void GLAPIENTRY _mesa_noop_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) { GET_CURRENT_CONTEXT(ctx); @@ -458,7 +458,7 @@ void _mesa_noop_VertexAttrib4fNV( GLuint index, GLfloat x, _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib4f" ); } -void _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat *v ) +void GLAPIENTRY _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat *v ) { GET_CURRENT_CONTEXT(ctx); if (index < VERT_ATTRIB_MAX) { @@ -470,7 +470,7 @@ void _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat *v ) /* Material */ -void _mesa_noop_Materialfv( GLenum face, GLenum pname, const GLfloat *params ) +void GLAPIENTRY _mesa_noop_Materialfv( GLenum face, GLenum pname, const GLfloat *params ) { GET_CURRENT_CONTEXT(ctx); GLint i, nr; @@ -499,64 +499,64 @@ void _mesa_noop_Materialfv( GLenum face, GLenum pname, const GLfloat *params ) /* These really are noops outside begin/end: */ -void _mesa_noop_Vertex2fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_Vertex2fv( const GLfloat *v ) { (void) v; } -void _mesa_noop_Vertex3fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_Vertex3fv( const GLfloat *v ) { (void) v; } -void _mesa_noop_Vertex4fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_Vertex4fv( const GLfloat *v ) { (void) v; } -void _mesa_noop_Vertex2f( GLfloat a, GLfloat b ) +void GLAPIENTRY _mesa_noop_Vertex2f( GLfloat a, GLfloat b ) { (void) a; (void) b; } -void _mesa_noop_Vertex3f( GLfloat a, GLfloat b, GLfloat c ) +void GLAPIENTRY _mesa_noop_Vertex3f( GLfloat a, GLfloat b, GLfloat c ) { (void) a; (void) b; (void) c; } -void _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) +void GLAPIENTRY _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) { (void) a; (void) b; (void) c; (void) d; } /* Similarly, these have no effect outside begin/end: */ -void _mesa_noop_EvalCoord1f( GLfloat a ) +void GLAPIENTRY _mesa_noop_EvalCoord1f( GLfloat a ) { (void) a; } -void _mesa_noop_EvalCoord1fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_EvalCoord1fv( const GLfloat *v ) { (void) v; } -void _mesa_noop_EvalCoord2f( GLfloat a, GLfloat b ) +void GLAPIENTRY _mesa_noop_EvalCoord2f( GLfloat a, GLfloat b ) { (void) a; (void) b; } -void _mesa_noop_EvalCoord2fv( const GLfloat *v ) +void GLAPIENTRY _mesa_noop_EvalCoord2fv( const GLfloat *v ) { (void) v; } -void _mesa_noop_EvalPoint1( GLint a ) +void GLAPIENTRY _mesa_noop_EvalPoint1( GLint a ) { (void) a; } -void _mesa_noop_EvalPoint2( GLint a, GLint b ) +void GLAPIENTRY _mesa_noop_EvalPoint2( GLint a, GLint b ) { (void) a; (void) b; } @@ -565,14 +565,14 @@ void _mesa_noop_EvalPoint2( GLint a, GLint b ) /* Begin -- call into driver, should result in the vtxfmt being * swapped out: */ -void _mesa_noop_Begin( GLenum mode ) +void GLAPIENTRY _mesa_noop_Begin( GLenum mode ) { } /* End -- just raise an error */ -void _mesa_noop_End( void ) +void GLAPIENTRY _mesa_noop_End( void ) { GET_CURRENT_CONTEXT(ctx); _mesa_error( ctx, GL_INVALID_OPERATION, "glEnd" ); @@ -587,7 +587,7 @@ void _mesa_noop_End( void ) * (None of the functions in this file are suitable for GL_COMPILE * modes). */ -void _mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ) +void GLAPIENTRY _mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ) { { GET_CURRENT_CONTEXT(ctx); @@ -607,7 +607,7 @@ void _mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ) * support can hook these in, but still need to supply an array-elt * implementation. */ -void _mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count) +void GLAPIENTRY _mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count) { GET_CURRENT_CONTEXT(ctx); GLint i; @@ -622,7 +622,7 @@ void _mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count) } -void _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type, +void GLAPIENTRY _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) { GET_CURRENT_CONTEXT(ctx); @@ -654,7 +654,7 @@ void _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type, glEnd(); } -void _mesa_noop_DrawRangeElements(GLenum mode, +void GLAPIENTRY _mesa_noop_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) @@ -680,7 +680,7 @@ void _mesa_noop_DrawRangeElements(GLenum mode, * map(1,2)_vertex is disabled, and to purge those vertices from * the vb. */ -void _mesa_noop_EvalMesh1( GLenum mode, GLint i1, GLint i2 ) +void GLAPIENTRY _mesa_noop_EvalMesh1( GLenum mode, GLint i1, GLint i2 ) { GET_CURRENT_CONTEXT(ctx); GLint i; @@ -718,7 +718,7 @@ void _mesa_noop_EvalMesh1( GLenum mode, GLint i1, GLint i2 ) -void _mesa_noop_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 ) +void GLAPIENTRY _mesa_noop_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 ) { GET_CURRENT_CONTEXT(ctx); GLfloat u, du, v, dv, v1, u1; diff --git a/src/mesa/main/api_noop.h b/src/mesa/main/api_noop.h index ecc889b67ee..7bb9c88dd1a 100644 --- a/src/mesa/main/api_noop.h +++ b/src/mesa/main/api_noop.h @@ -38,139 +38,139 @@ * currently enabled hardware vertex. * */ -extern void _mesa_noop_EdgeFlag( GLboolean b ); +extern void GLAPIENTRY _mesa_noop_EdgeFlag( GLboolean b ); -extern void _mesa_noop_EdgeFlagv( const GLboolean *b ); +extern void GLAPIENTRY _mesa_noop_EdgeFlagv( const GLboolean *b ); -extern void _mesa_noop_FogCoordfEXT( GLfloat a ); +extern void GLAPIENTRY _mesa_noop_FogCoordfEXT( GLfloat a ); -extern void _mesa_noop_FogCoordfvEXT( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_FogCoordfvEXT( const GLfloat *v ); -extern void _mesa_noop_Indexf( GLfloat i ); +extern void GLAPIENTRY _mesa_noop_Indexf( GLfloat i ); -extern void _mesa_noop_Indexfv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_Indexfv( const GLfloat *v ); -extern void _mesa_noop_Normal3f( GLfloat a, GLfloat b, GLfloat c ); +extern void GLAPIENTRY _mesa_noop_Normal3f( GLfloat a, GLfloat b, GLfloat c ); -extern void _mesa_noop_Normal3fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_Normal3fv( const GLfloat *v ); -extern void _mesa_noop_Materialfv( GLenum face, GLenum pname, const GLfloat *param ); +extern void GLAPIENTRY _mesa_noop_Materialfv( GLenum face, GLenum pname, const GLfloat *param ); extern void _mesa_noop_Color4ub( GLubyte a, GLubyte b, GLubyte c, GLubyte d ); extern void _mesa_noop_Color4ubv( const GLubyte *v ); -extern void _mesa_noop_Color4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ); +extern void GLAPIENTRY _mesa_noop_Color4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ); -extern void _mesa_noop_Color4fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_Color4fv( const GLfloat *v ); extern void _mesa_noop_Color3ub( GLubyte a, GLubyte b, GLubyte c ); extern void _mesa_noop_Color3ubv( const GLubyte *v ); -extern void _mesa_noop_Color3f( GLfloat a, GLfloat b, GLfloat c ); +extern void GLAPIENTRY _mesa_noop_Color3f( GLfloat a, GLfloat b, GLfloat c ); -extern void _mesa_noop_Color3fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_Color3fv( const GLfloat *v ); -extern void _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a ); +extern void GLAPIENTRY _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a ); -extern void _mesa_noop_MultiTexCoord1fvARB( GLenum target, const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_MultiTexCoord1fvARB( GLenum target, const GLfloat *v ); -extern void _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, +extern void GLAPIENTRY _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, GLfloat b ); -extern void _mesa_noop_MultiTexCoord2fvARB( GLenum target, const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_MultiTexCoord2fvARB( GLenum target, const GLfloat *v ); -extern void _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, +extern void GLAPIENTRY _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c); -extern void _mesa_noop_MultiTexCoord3fvARB( GLenum target, const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_MultiTexCoord3fvARB( GLenum target, const GLfloat *v ); -extern void _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, +extern void GLAPIENTRY _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c, GLfloat d ); -extern void _mesa_noop_MultiTexCoord4fvARB( GLenum target, const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_MultiTexCoord4fvARB( GLenum target, const GLfloat *v ); extern void _mesa_noop_SecondaryColor3ubEXT( GLubyte a, GLubyte b, GLubyte c ); extern void _mesa_noop_SecondaryColor3ubvEXT( const GLubyte *v ); -extern void _mesa_noop_SecondaryColor3fEXT( GLfloat a, GLfloat b, GLfloat c ); +extern void GLAPIENTRY _mesa_noop_SecondaryColor3fEXT( GLfloat a, GLfloat b, GLfloat c ); -extern void _mesa_noop_SecondaryColor3fvEXT( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_SecondaryColor3fvEXT( const GLfloat *v ); -extern void _mesa_noop_TexCoord1f( GLfloat a ); +extern void GLAPIENTRY _mesa_noop_TexCoord1f( GLfloat a ); -extern void _mesa_noop_TexCoord1fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_TexCoord1fv( const GLfloat *v ); -extern void _mesa_noop_TexCoord2f( GLfloat a, GLfloat b ); +extern void GLAPIENTRY _mesa_noop_TexCoord2f( GLfloat a, GLfloat b ); -extern void _mesa_noop_TexCoord2fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_TexCoord2fv( const GLfloat *v ); -extern void _mesa_noop_TexCoord3f( GLfloat a, GLfloat b, GLfloat c ); +extern void GLAPIENTRY _mesa_noop_TexCoord3f( GLfloat a, GLfloat b, GLfloat c ); -extern void _mesa_noop_TexCoord3fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_TexCoord3fv( const GLfloat *v ); -extern void _mesa_noop_TexCoord4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ); +extern void GLAPIENTRY _mesa_noop_TexCoord4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ); -extern void _mesa_noop_TexCoord4fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_TexCoord4fv( const GLfloat *v ); -extern void _mesa_noop_Vertex2fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_Vertex2fv( const GLfloat *v ); -extern void _mesa_noop_Vertex3fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_Vertex3fv( const GLfloat *v ); -extern void _mesa_noop_Vertex4fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_Vertex4fv( const GLfloat *v ); -extern void _mesa_noop_Vertex2f( GLfloat a, GLfloat b ); +extern void GLAPIENTRY _mesa_noop_Vertex2f( GLfloat a, GLfloat b ); -extern void _mesa_noop_Vertex3f( GLfloat a, GLfloat b, GLfloat c ); +extern void GLAPIENTRY _mesa_noop_Vertex3f( GLfloat a, GLfloat b, GLfloat c ); -extern void _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ); +extern void GLAPIENTRY _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d ); -extern void _mesa_noop_VertexAttrib1fNV( GLuint index, GLfloat x ); +extern void GLAPIENTRY _mesa_noop_VertexAttrib1fNV( GLuint index, GLfloat x ); -extern void _mesa_noop_VertexAttrib1fvNV( GLuint index, const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_VertexAttrib1fvNV( GLuint index, const GLfloat *v ); -extern void _mesa_noop_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ); -extern void _mesa_noop_VertexAttrib2fvNV( GLuint index, const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ); +extern void GLAPIENTRY _mesa_noop_VertexAttrib2fvNV( GLuint index, const GLfloat *v ); -extern void _mesa_noop_VertexAttrib3fNV( GLuint index, GLfloat x, +extern void GLAPIENTRY _mesa_noop_VertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, GLfloat z ); -extern void _mesa_noop_VertexAttrib3fvNV( GLuint index, const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_VertexAttrib3fvNV( GLuint index, const GLfloat *v ); -extern void _mesa_noop_VertexAttrib4fNV( GLuint index, GLfloat x, +extern void GLAPIENTRY _mesa_noop_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w ); -extern void _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat *v ); -extern void _mesa_noop_End( void ); -extern void _mesa_noop_Begin( GLenum mode ); -extern void _mesa_noop_EvalPoint2( GLint a, GLint b ); -extern void _mesa_noop_EvalPoint1( GLint a ); -extern void _mesa_noop_EvalCoord2fv( const GLfloat *v ); -extern void _mesa_noop_EvalCoord2f( GLfloat a, GLfloat b ); -extern void _mesa_noop_EvalCoord1fv( const GLfloat *v ); -extern void _mesa_noop_EvalCoord1f( GLfloat a ); +extern void GLAPIENTRY _mesa_noop_End( void ); +extern void GLAPIENTRY _mesa_noop_Begin( GLenum mode ); +extern void GLAPIENTRY _mesa_noop_EvalPoint2( GLint a, GLint b ); +extern void GLAPIENTRY _mesa_noop_EvalPoint1( GLint a ); +extern void GLAPIENTRY _mesa_noop_EvalCoord2fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_EvalCoord2f( GLfloat a, GLfloat b ); +extern void GLAPIENTRY _mesa_noop_EvalCoord1fv( const GLfloat *v ); +extern void GLAPIENTRY _mesa_noop_EvalCoord1f( GLfloat a ); extern void _mesa_noop_vtxfmt_init( GLvertexformat *vfmt ); -extern void _mesa_noop_EvalMesh2( GLenum mode, GLint i1, GLint i2, +extern void GLAPIENTRY _mesa_noop_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 ); -extern void _mesa_noop_EvalMesh1( GLenum mode, GLint i1, GLint i2 ); +extern void GLAPIENTRY _mesa_noop_EvalMesh1( GLenum mode, GLint i1, GLint i2 ); /* Not strictly a noop -- translate Rectf down to Begin/End and * vertices. Closer to the loopback operations, but doesn't meet the * criteria for inclusion there (cannot be used in the Save table). */ -extern void _mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ); +extern void GLAPIENTRY _mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ); -extern void _mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count); -extern void _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type, +extern void GLAPIENTRY _mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count); +extern void GLAPIENTRY _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); -extern void _mesa_noop_DrawRangeElements(GLenum mode, +extern void GLAPIENTRY _mesa_noop_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index d8ef3bbb315..375aa4bf86a 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -4670,7 +4670,7 @@ static void save_Attr4f( GLenum attr, GLfloat x, GLfloat y, GLfloat z, } } -static void save_EvalCoord1f( GLfloat x ) +static void GLAPIENTRY save_EvalCoord1f( GLfloat x ) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4684,12 +4684,12 @@ static void save_EvalCoord1f( GLfloat x ) } } -static void save_EvalCoord1fv( const GLfloat *v ) +static void GLAPIENTRY save_EvalCoord1fv( const GLfloat *v ) { save_EvalCoord1f( v[0] ); } -static void save_EvalCoord2f( GLfloat x, GLfloat y ) +static void GLAPIENTRY save_EvalCoord2f( GLfloat x, GLfloat y ) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4704,13 +4704,13 @@ static void save_EvalCoord2f( GLfloat x, GLfloat y ) } } -static void save_EvalCoord2fv( const GLfloat *v ) +static void GLAPIENTRY save_EvalCoord2fv( const GLfloat *v ) { save_EvalCoord2f( v[0], v[1] ); } -static void save_EvalPoint1( GLint x ) +static void GLAPIENTRY save_EvalPoint1( GLint x ) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4724,7 +4724,7 @@ static void save_EvalPoint1( GLint x ) } } -static void save_EvalPoint2( GLint x, GLint y ) +static void GLAPIENTRY save_EvalPoint2( GLint x, GLint y ) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4739,7 +4739,7 @@ static void save_EvalPoint2( GLint x, GLint y ) } } -static void save_Indexf( GLfloat x ) +static void GLAPIENTRY save_Indexf( GLfloat x ) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4757,12 +4757,12 @@ static void save_Indexf( GLfloat x ) } } -static void save_Indexfv( const GLfloat *v ) +static void GLAPIENTRY save_Indexfv( const GLfloat *v ) { save_Indexf( v[0] ); } -static void save_EdgeFlag( GLboolean x ) +static void GLAPIENTRY save_EdgeFlag( GLboolean x ) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4780,12 +4780,12 @@ static void save_EdgeFlag( GLboolean x ) } } -static void save_EdgeFlagv( const GLboolean *v ) +static void GLAPIENTRY save_EdgeFlagv( const GLboolean *v ) { save_EdgeFlag( v[0] ); } -static void save_Materialfv( GLenum face, GLenum pname, const GLfloat *param ) +static void GLAPIENTRY save_Materialfv( GLenum face, GLenum pname, const GLfloat *param ) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4844,7 +4844,7 @@ static void save_Materialfv( GLenum face, GLenum pname, const GLfloat *param ) } } -static void save_Begin( GLenum mode ) +static void GLAPIENTRY save_Begin( GLenum mode ) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4888,7 +4888,7 @@ static void save_Begin( GLenum mode ) } } -static void save_End( void ) +static void GLAPIENTRY save_End( void ) { GET_CURRENT_CONTEXT(ctx); SAVE_FLUSH_VERTICES( ctx ); @@ -4899,7 +4899,7 @@ static void save_End( void ) } } -static void save_Rectf( GLfloat a, GLfloat b, +static void GLAPIENTRY save_Rectf( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) { GET_CURRENT_CONTEXT(ctx); @@ -4919,122 +4919,122 @@ static void save_Rectf( GLfloat a, GLfloat b, /* */ -static void save_Vertex2f( GLfloat x, GLfloat y ) +static void GLAPIENTRY save_Vertex2f( GLfloat x, GLfloat y ) { save_Attr2f( VERT_ATTRIB_POS, x, y ); } -static void save_Vertex2fv( const GLfloat *v ) +static void GLAPIENTRY save_Vertex2fv( const GLfloat *v ) { save_Attr2f( VERT_ATTRIB_POS, v[0], v[1] ); } -static void save_Vertex3f( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY save_Vertex3f( GLfloat x, GLfloat y, GLfloat z ) { save_Attr3f( VERT_ATTRIB_POS, x, y, z ); } -static void save_Vertex3fv( const GLfloat *v ) +static void GLAPIENTRY save_Vertex3fv( const GLfloat *v ) { save_Attr3f( VERT_ATTRIB_POS, v[0], v[1], v[2] ); } -static void save_Vertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) +static void GLAPIENTRY save_Vertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) { save_Attr4f( VERT_ATTRIB_POS, x, y, z, w ); } -static void save_Vertex4fv( const GLfloat *v ) +static void GLAPIENTRY save_Vertex4fv( const GLfloat *v ) { save_Attr4f( VERT_ATTRIB_POS, v[0], v[1], v[2], v[3] ); } -static void save_TexCoord1f( GLfloat x ) +static void GLAPIENTRY save_TexCoord1f( GLfloat x ) { save_Attr1f( VERT_ATTRIB_TEX0, x ); } -static void save_TexCoord1fv( const GLfloat *v ) +static void GLAPIENTRY save_TexCoord1fv( const GLfloat *v ) { save_Attr1f( VERT_ATTRIB_TEX0, v[0] ); } -static void save_TexCoord2f( GLfloat x, GLfloat y ) +static void GLAPIENTRY save_TexCoord2f( GLfloat x, GLfloat y ) { save_Attr2f( VERT_ATTRIB_TEX0, x, y ); } -static void save_TexCoord2fv( const GLfloat *v ) +static void GLAPIENTRY save_TexCoord2fv( const GLfloat *v ) { save_Attr2f( VERT_ATTRIB_TEX0, v[0], v[1] ); } -static void save_TexCoord3f( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY save_TexCoord3f( GLfloat x, GLfloat y, GLfloat z ) { save_Attr3f( VERT_ATTRIB_TEX0, x, y, z ); } -static void save_TexCoord3fv( const GLfloat *v ) +static void GLAPIENTRY save_TexCoord3fv( const GLfloat *v ) { save_Attr3f( VERT_ATTRIB_TEX0, v[0], v[1], v[2] ); } -static void save_TexCoord4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) +static void GLAPIENTRY save_TexCoord4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) { save_Attr4f( VERT_ATTRIB_TEX0, x, y, z, w ); } -static void save_TexCoord4fv( const GLfloat *v ) +static void GLAPIENTRY save_TexCoord4fv( const GLfloat *v ) { save_Attr4f( VERT_ATTRIB_TEX0, v[0], v[1], v[2], v[3] ); } -static void save_Normal3f( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY save_Normal3f( GLfloat x, GLfloat y, GLfloat z ) { save_Attr3f( VERT_ATTRIB_NORMAL, x, y, z ); } -static void save_Normal3fv( const GLfloat *v ) +static void GLAPIENTRY save_Normal3fv( const GLfloat *v ) { save_Attr3f( VERT_ATTRIB_NORMAL, v[0], v[1], v[2] ); } -static void save_FogCoordfEXT( GLfloat x ) +static void GLAPIENTRY save_FogCoordfEXT( GLfloat x ) { save_Attr1f( VERT_ATTRIB_FOG, x ); } -static void save_FogCoordfvEXT( const GLfloat *v ) +static void GLAPIENTRY save_FogCoordfvEXT( const GLfloat *v ) { save_Attr1f( VERT_ATTRIB_FOG, v[0] ); } -static void save_Color3f( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY save_Color3f( GLfloat x, GLfloat y, GLfloat z ) { save_Attr3f( VERT_ATTRIB_COLOR0, x, y, z ); } -static void save_Color3fv( const GLfloat *v ) +static void GLAPIENTRY save_Color3fv( const GLfloat *v ) { save_Attr3f( VERT_ATTRIB_COLOR0, v[0], v[1], v[2] ); } -static void save_Color4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) +static void GLAPIENTRY save_Color4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) { save_Attr4f( VERT_ATTRIB_COLOR0, x, y, z, w ); } -static void save_Color4fv( const GLfloat *v ) +static void GLAPIENTRY save_Color4fv( const GLfloat *v ) { save_Attr4f( VERT_ATTRIB_COLOR0, v[0], v[1], v[2], v[3] ); } -static void save_SecondaryColor3fEXT( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY save_SecondaryColor3fEXT( GLfloat x, GLfloat y, GLfloat z ) { save_Attr3f( VERT_ATTRIB_COLOR1, x, y, z ); } -static void save_SecondaryColor3fvEXT( const GLfloat *v ) +static void GLAPIENTRY save_SecondaryColor3fvEXT( const GLfloat *v ) { save_Attr3f( VERT_ATTRIB_COLOR1, v[0], v[1], v[2] ); } @@ -5042,51 +5042,51 @@ static void save_SecondaryColor3fvEXT( const GLfloat *v ) /* Just call the respective ATTR for texcoord */ -static void save_MultiTexCoord1f( GLenum target, GLfloat x ) +static void GLAPIENTRY save_MultiTexCoord1f( GLenum target, GLfloat x ) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; save_Attr1f( attr, x ); } -static void save_MultiTexCoord1fv( GLenum target, const GLfloat *v ) +static void GLAPIENTRY save_MultiTexCoord1fv( GLenum target, const GLfloat *v ) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; save_Attr1f( attr, v[0] ); } -static void save_MultiTexCoord2f( GLenum target, GLfloat x, GLfloat y ) +static void GLAPIENTRY save_MultiTexCoord2f( GLenum target, GLfloat x, GLfloat y ) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; save_Attr2f( attr, x, y ); } -static void save_MultiTexCoord2fv( GLenum target, const GLfloat *v ) +static void GLAPIENTRY save_MultiTexCoord2fv( GLenum target, const GLfloat *v ) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; save_Attr2f( attr, v[0], v[1] ); } -static void save_MultiTexCoord3f( GLenum target, GLfloat x, GLfloat y, +static void GLAPIENTRY save_MultiTexCoord3f( GLenum target, GLfloat x, GLfloat y, GLfloat z) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; save_Attr3f( attr, x, y, z ); } -static void save_MultiTexCoord3fv( GLenum target, const GLfloat *v ) +static void GLAPIENTRY save_MultiTexCoord3fv( GLenum target, const GLfloat *v ) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; save_Attr3f( attr, v[0], v[1], v[2] ); } -static void save_MultiTexCoord4f( GLenum target, GLfloat x, GLfloat y, +static void GLAPIENTRY save_MultiTexCoord4f( GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; save_Attr4f( attr, x, y, z, w ); } -static void save_MultiTexCoord4fv( GLenum target, const GLfloat *v ) +static void GLAPIENTRY save_MultiTexCoord4fv( GLenum target, const GLfloat *v ) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; save_Attr4f( attr, v[0], v[1], v[2], v[3] ); @@ -5103,7 +5103,7 @@ static void enum_error() * * Check for errors at compile time?. */ -static void save_VertexAttrib1fNV( GLuint index, GLfloat x ) +static void GLAPIENTRY save_VertexAttrib1fNV( GLuint index, GLfloat x ) { if (index < VERT_ATTRIB_MAX) save_Attr1f( index, x ); @@ -5111,7 +5111,7 @@ static void save_VertexAttrib1fNV( GLuint index, GLfloat x ) enum_error(); } -static void save_VertexAttrib1fvNV( GLuint index, const GLfloat *v ) +static void GLAPIENTRY save_VertexAttrib1fvNV( GLuint index, const GLfloat *v ) { if (index < VERT_ATTRIB_MAX) save_Attr1f( index, v[0] ); @@ -5119,7 +5119,7 @@ static void save_VertexAttrib1fvNV( GLuint index, const GLfloat *v ) enum_error(); } -static void save_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ) +static void GLAPIENTRY save_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ) { if (index < VERT_ATTRIB_MAX) save_Attr2f( index, x, y ); @@ -5127,7 +5127,7 @@ static void save_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ) enum_error(); } -static void save_VertexAttrib2fvNV( GLuint index, const GLfloat *v ) +static void GLAPIENTRY save_VertexAttrib2fvNV( GLuint index, const GLfloat *v ) { if (index < VERT_ATTRIB_MAX) save_Attr2f( index, v[0], v[1] ); @@ -5135,7 +5135,7 @@ static void save_VertexAttrib2fvNV( GLuint index, const GLfloat *v ) enum_error(); } -static void save_VertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, +static void GLAPIENTRY save_VertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, GLfloat z ) { if (index < VERT_ATTRIB_MAX) @@ -5144,7 +5144,7 @@ static void save_VertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, enum_error(); } -static void save_VertexAttrib3fvNV( GLuint index, const GLfloat *v ) +static void GLAPIENTRY save_VertexAttrib3fvNV( GLuint index, const GLfloat *v ) { if (index < VERT_ATTRIB_MAX) save_Attr3f( index, v[0], v[1], v[2] ); @@ -5152,7 +5152,7 @@ static void save_VertexAttrib3fvNV( GLuint index, const GLfloat *v ) enum_error(); } -static void save_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, +static void GLAPIENTRY save_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) { if (index < VERT_ATTRIB_MAX) @@ -5161,7 +5161,7 @@ static void save_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, enum_error(); } -static void save_VertexAttrib4fvNV( GLuint index, const GLfloat *v ) +static void GLAPIENTRY save_VertexAttrib4fvNV( GLuint index, const GLfloat *v ) { if (index < VERT_ATTRIB_MAX) save_Attr4f( index, v[0], v[1], v[2], v[3] ); |