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/texstore.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/texstore.h')
| -rw-r--r-- | src/mesa/main/texstore.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h index f6931dc5e7..72da2a08f9 100644 --- a/src/mesa/main/texstore.h +++ b/src/mesa/main/texstore.h @@ -64,7 +64,7 @@ extern void _mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint height, GLint border, - GLenum format, GLenum type, const void *pixels, + GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage); @@ -74,7 +74,7 @@ extern void _mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint height, GLint depth, GLint border, - GLenum format, GLenum type, const void *pixels, + GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage); @@ -83,7 +83,7 @@ _mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level, extern void _mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint width, - GLenum format, GLenum type, const void *pixels, + GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage); @@ -93,7 +93,7 @@ extern void _mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint width, GLint height, - GLenum format, GLenum type, const void *pixels, + GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage); @@ -103,7 +103,7 @@ extern void _mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint width, GLint height, GLint depth, - GLenum format, GLenum type, const void *pixels, + GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage); |