From d6643331ab1a2215338be19177296d255170c798 Mon Sep 17 00:00:00 2001 From: Kendall Bennett Date: Tue, 30 Sep 2003 20:02:27 +0000 Subject: Updates required for building the SciTech SNAP version of Mesa. This includes: 1. Changes to the main header files to exclude some stuff is __SCITECH_SNAP__ is defined. The main GL/gl.h header file in SciTech SNAP is actually a wrapper that defines a bunch of necessary stuff and then included GL/gl_mesa.h which is the normal Mesa GL/gl.h header file renamed. 2. Changed APIENTRY * to APIENTRYP macros in the GL/gl.h and GL/glext.h header files. This will better support other compilers like IBM VisualAge C++. I added a basic macro for APIENTRYP to GL/gl.h (inside the !SNAP block), so existing code will compile the same, but when the SNAP version is being built we will use the correc definitions for the target compiler. 3. Changed a few more void * declarations to GLvoid *'s to avoid Open Watcom compiler complaints. 4. Updates the OPENGL_VERSION macro to include a patch number (set to 0 for now). Probably not necessary, but the original macro was wrong and we use that macro in our code. 5. Changed _tnl_end() to _tnl_end_ctx() to avoid conflicts with _tnl_End when using a compiler that has a case insensitive link. --- src/mesa/tnl/t_imm_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/tnl/t_imm_api.c') diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c index 0449504300..c0dcb1863c 100644 --- a/src/mesa/tnl/t_imm_api.c +++ b/src/mesa/tnl/t_imm_api.c @@ -334,7 +334,7 @@ _tnl_hard_begin( GLcontext *ctx, GLenum p ) * rects/arrays together in a single immediate struct. */ void -_tnl_end( GLcontext *ctx ) +_tnl_end_ctx( GLcontext *ctx ) { struct immediate *IM = TNL_CURRENT_IM(ctx); GLuint state = IM->BeginState; @@ -387,7 +387,7 @@ _tnl_End(void) { GET_CURRENT_CONTEXT(ctx); - _tnl_end( ctx ); + _tnl_end_ctx( ctx ); /* Need to keep save primitive uptodate in COMPILE and * COMPILE_AND_EXEC modes, need to keep exec primitive uptodate -- cgit v1.2.3