diff options
| author | Kendall Bennett <KendallB@scitechsoft.com> | 2003-09-30 20:02:27 +0000 |
|---|---|---|
| committer | Kendall Bennett <KendallB@scitechsoft.com> | 2003-09-30 20:02:27 +0000 |
| commit | d6643331ab1a2215338be19177296d255170c798 (patch) | |
| tree | a38a3dda6bc772386e6ae79428f268de8dcd67cd /src/mesa/main/version.h | |
| parent | 7214e1a1c45ea444777816d4241e09dcd91125a6 (diff) | |
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.
Diffstat (limited to 'src/mesa/main/version.h')
| -rw-r--r-- | src/mesa/main/version.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index a8c3dfc03a..371a6e59a1 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -41,11 +41,12 @@ /* OpenGL API version */ #define OPENGL_MAJOR 1 #define OPENGL_MINOR 4 +#define OPENGL_PATCH 0 #define OPENGL_VERSION_STRING "1.4" /* To make version comparison easy */ -#define OPENGL_VERSION(a,b) (((a) << 16) + ((b) << 8) + (0)) -#define OPENGL_VERSION_CODE OPENGL_VERSION(OPENGL_MAJOR, OPENGL_MINOR) +#define OPENGL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) +#define OPENGL_VERSION_CODE OPENGL_VERSION(OPENGL_MAJOR, OPENGL_MINOR, OPENGL_PATCH) #endif /* VERSION_H */ |