diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/glheader.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/texstore.h | 10 | ||||
| -rw-r--r-- | src/mesa/main/version.h | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index f0cc2df075..8682732468 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -113,7 +113,7 @@ # endif # define GLWINAPI __stdcall # define GLWINAPIV __cdecl -#else +#elif !defined(__SCITECH_SNAP__) /* non-Windows compilation */ # define GLAPI extern # define GLAPIENTRY 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); 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 */ |