diff options
| author | Jouk Jansen <joukj@hrem.stm.tudelft.nl> | 2000-02-25 12:35:57 +0000 |
|---|---|---|
| committer | Jouk Jansen <joukj@hrem.stm.tudelft.nl> | 2000-02-25 12:35:57 +0000 |
| commit | eaba005f189d73995fc13920e523d66e814f8326 (patch) | |
| tree | 68278ed07ec3cb78d67100112018090acea34e71 /include | |
| parent | f183a0fc01df6af575e80481cfae797cba72d617 (diff) | |
Committing in .
VMS & type-mismatch problems
Modified Files:
Mesa/include/GL/glext.h Mesa/include/GL/glx.h
----------------------------------------------------------------------
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/glext.h | 9 | ||||
| -rw-r--r-- | include/GL/glx.h | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/GL/glext.h b/include/GL/glext.h index 934c7f6755..588994774c 100644 --- a/include/GL/glext.h +++ b/include/GL/glext.h @@ -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 */ diff --git a/include/GL/glx.h b/include/GL/glx.h index d54a6684f6..d770fb989e 100644 --- a/include/GL/glx.h +++ b/include/GL/glx.h @@ -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 ); |