Committing in .
VMS & type-mismatch problems Modified Files: Mesa/include/GL/glext.h Mesa/include/GL/glx.h ----------------------------------------------------------------------
This commit is contained in:
+8
-1
@@ -1250,6 +1250,14 @@ GLAPI void APIENTRY glGetCombinerInputParameterfvNV(GLenum stage, GLenum portion
|
||||
|
||||
GLAPI void APIENTRY glGetCombinerInputParameterivNV(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params);
|
||||
|
||||
#ifdef VMS
|
||||
/*VMS only allows externals of maximal 31 characters! */
|
||||
# define glGetCombinerOutputParameterfvNV glGetCombinerOutputParameterfvN
|
||||
#define glGetCombinerOutputParameterivNV glGetCombinerOutputParameterivN
|
||||
#define glGetFinalCombinerInputParameterfvNV glGetFnlCmbinerInpParameterfvNV
|
||||
#define glGetFinalCombinerInputParameterivNV glGetFnlCmbinerInpParameterivNV
|
||||
#endif
|
||||
|
||||
GLAPI void APIENTRY glGetCombinerOutputParameterfvNV(GLenum stage, GLenum portion, GLenum pname, GLfloat * params);
|
||||
|
||||
GLAPI void APIENTRY glGetCombinerOutputParameterivNV(GLenum stage, GLenum portion, GLenum pname, GLint * params);
|
||||
@@ -1257,7 +1265,6 @@ GLAPI void APIENTRY glGetCombinerOutputParameterivNV(GLenum stage, GLenum portio
|
||||
GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV(GLenum variable, GLenum pname, GLfloat * params);
|
||||
|
||||
GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV(GLenum variable, GLenum pname, GLint * params);
|
||||
|
||||
#endif /* GL_NV_register_combiners */
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
/* $Id: glx.h,v 1.11 2000/02/23 23:04:27 brianp Exp $ */
|
||||
/* $Id: glx.h,v 1.12 2000/02/25 12:35:57 joukj Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
@@ -225,7 +225,7 @@ extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
|
||||
GLXContext ctx);
|
||||
|
||||
extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
|
||||
unsigned long mask );
|
||||
GLuint mask );
|
||||
|
||||
extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user