summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/glheader.h2
-rw-r--r--src/mesa/main/texstore.h10
-rw-r--r--src/mesa/main/version.h5
-rw-r--r--src/mesa/tnl/t_eval_api.c10
-rw-r--r--src/mesa/tnl/t_imm_api.c4
-rw-r--r--src/mesa/tnl/t_imm_api.h2
6 files changed, 17 insertions, 16 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index f0cc2df0750..86827324688 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 f6931dc5e7b..72da2a08f96 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 a8c3dfc03a5..371a6e59a1b 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 */
diff --git a/src/mesa/tnl/t_eval_api.c b/src/mesa/tnl/t_eval_api.c
index 08eb9d35629..294f1b742cf 100644
--- a/src/mesa/tnl/t_eval_api.c
+++ b/src/mesa/tnl/t_eval_api.c
@@ -120,7 +120,7 @@ _tnl_exec_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
for (i=i1;i<=i2;i++,u+=du) {
_tnl_eval_coord1f( ctx, u );
}
- _tnl_end(ctx);
+ _tnl_end_ctx(ctx);
/* Need this for replay *and* compile:
*/
@@ -190,7 +190,7 @@ _tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
_tnl_eval_coord2f( ctx, u, v );
}
}
- _tnl_end(ctx);
+ _tnl_end_ctx(ctx);
break;
case GL_LINE:
for (v=v1,j=j1;j<=j2;j++,v+=dv) {
@@ -198,14 +198,14 @@ _tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
for (u=u1,i=i1;i<=i2;i++,u+=du) {
_tnl_eval_coord2f( ctx, u, v );
}
- _tnl_end(ctx);
+ _tnl_end_ctx(ctx);
}
for (u=u1,i=i1;i<=i2;i++,u+=du) {
_tnl_Begin( GL_LINE_STRIP );
for (v=v1,j=j1;j<=j2;j++,v+=dv) {
_tnl_eval_coord2f( ctx, u, v );
}
- _tnl_end(ctx);
+ _tnl_end_ctx(ctx);
}
break;
case GL_FILL:
@@ -215,7 +215,7 @@ _tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
_tnl_eval_coord2f( ctx, u, v );
_tnl_eval_coord2f( ctx, u, v+dv );
}
- _tnl_end(ctx);
+ _tnl_end_ctx(ctx);
}
break;
default:
diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c
index 04495043002..c0dcb1863ce 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
diff --git a/src/mesa/tnl/t_imm_api.h b/src/mesa/tnl/t_imm_api.h
index 1cb89fd4d1a..a6a06235c7d 100644
--- a/src/mesa/tnl/t_imm_api.h
+++ b/src/mesa/tnl/t_imm_api.h
@@ -42,7 +42,7 @@ extern void _tnl_End(void);
/* TNL-private internal functions for building higher-level operations:
*/
extern GLboolean _tnl_hard_begin( GLcontext *ctx, GLenum p );
-extern void _tnl_end( GLcontext *ctx );
+extern void _tnl_end_ctx( GLcontext *ctx );
extern void _tnl_vertex2f( GLcontext *ctx, GLfloat x, GLfloat y );
extern void _tnl_eval_coord1f( GLcontext *CC, GLfloat u );
extern void _tnl_eval_coord2f( GLcontext *CC, GLfloat u, GLfloat v );
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 19:01:59 +0000