From c1d455f5827e7044dcb316dadc755a6f91299906 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 27 May 2004 00:03:53 +0000 Subject: Convert all calls using _glapi_Dispatch to use the new GL_CALL macro. --- src/mesa/tnl/t_array_api.c | 12 ++++++------ src/mesa/tnl/t_save_api.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/mesa/tnl') diff --git a/src/mesa/tnl/t_array_api.c b/src/mesa/tnl/t_array_api.c index 8375c1711f..cc709d3641 100644 --- a/src/mesa/tnl/t_array_api.c +++ b/src/mesa/tnl/t_array_api.c @@ -52,10 +52,10 @@ static void fallback_drawarrays( GLcontext *ctx, GLenum mode, GLint start, assert(!ctx->CompileFlag); assert(ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1); - _glapi_Dispatch->Begin(mode); + GL_CALL(Begin)(mode); for (i = 0; i < count; i++) - _glapi_Dispatch->ArrayElement( start + i ); - _glapi_Dispatch->End(); + GL_CALL(ArrayElement)( start + i ); + GL_CALL(End)(); } @@ -69,11 +69,11 @@ static void fallback_drawelements( GLcontext *ctx, GLenum mode, GLsizei count, /* Here, indices will already reflect the buffer object if active */ - _glapi_Dispatch->Begin(mode); + GL_CALL(Begin)(mode); for (i = 0 ; i < count ; i++) { - _glapi_Dispatch->ArrayElement( indices[i] ); + GL_CALL(ArrayElement)( indices[i] ); } - _glapi_Dispatch->End(); + GL_CALL(End)(); } diff --git a/src/mesa/tnl/t_save_api.c b/src/mesa/tnl/t_save_api.c index 1f332c7a9a..c40de16fca 100644 --- a/src/mesa/tnl/t_save_api.c +++ b/src/mesa/tnl/t_save_api.c @@ -1294,11 +1294,11 @@ static void GLAPIENTRY _save_OBE_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfl { GET_CURRENT_CONTEXT(ctx); _save_NotifyBegin( ctx, GL_QUADS | PRIM_WEAK ); - _glapi_Dispatch->Vertex2f( x1, y1 ); - _glapi_Dispatch->Vertex2f( x2, y1 ); - _glapi_Dispatch->Vertex2f( x2, y2 ); - _glapi_Dispatch->Vertex2f( x1, y2 ); - _glapi_Dispatch->End(); + GL_CALL(Vertex2f)( x1, y1 ); + GL_CALL(Vertex2f)( x2, y1 ); + GL_CALL(Vertex2f)( x2, y2 ); + GL_CALL(Vertex2f)( x1, y2 ); + GL_CALL(End)(); } @@ -1312,8 +1312,8 @@ static void GLAPIENTRY _save_OBE_DrawArrays(GLenum mode, GLint start, GLsizei co _save_NotifyBegin( ctx, mode | PRIM_WEAK ); for (i = 0; i < count; i++) - _glapi_Dispatch->ArrayElement(start + i); - _glapi_Dispatch->End(); + GL_CALL(ArrayElement)(start + i); + GL_CALL(End)(); } @@ -1331,22 +1331,22 @@ static void GLAPIENTRY _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum switch (type) { case GL_UNSIGNED_BYTE: for (i = 0 ; i < count ; i++) - _glapi_Dispatch->ArrayElement( ((GLubyte *)indices)[i] ); + GL_CALL(ArrayElement)( ((GLubyte *)indices)[i] ); break; case GL_UNSIGNED_SHORT: for (i = 0 ; i < count ; i++) - _glapi_Dispatch->ArrayElement( ((GLushort *)indices)[i] ); + GL_CALL(ArrayElement)( ((GLushort *)indices)[i] ); break; case GL_UNSIGNED_INT: for (i = 0 ; i < count ; i++) - _glapi_Dispatch->ArrayElement( ((GLuint *)indices)[i] ); + GL_CALL(ArrayElement)( ((GLuint *)indices)[i] ); break; default: _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElements(type)" ); break; } - _glapi_Dispatch->End(); + GL_CALL(End)(); } static void GLAPIENTRY _save_OBE_DrawRangeElements(GLenum mode, -- cgit v1.2.3