diff options
| author | Sven Gothel <[email protected]> | 2010-11-06 06:40:35 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-06 06:40:35 +0100 |
| commit | 809d864d88744b80e8e9374d2bbc9d939dbb58f7 (patch) | |
| tree | 88e0ea98baebca47b22f267a769365e70e0d156e /make/stub_includes/opengl/GL3 | |
| parent | abe789311fa607bd73277b38024b4908e350fd8c (diff) | |
Minor patch to headers for gluegen ; GLES2 extensions
- ifndef GLAPI
- GLES2/gl2ext.h add a few basic extensions
- gl-64bit-types.h: use khronos 64bit types
Diffstat (limited to 'make/stub_includes/opengl/GL3')
| -rw-r--r-- | make/stub_includes/opengl/GL3/gl3.h | 6 | ||||
| -rw-r--r-- | make/stub_includes/opengl/GL3/glplatform.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/make/stub_includes/opengl/GL3/gl3.h b/make/stub_includes/opengl/GL3/gl3.h index 460d38b15..a4109badf 100644 --- a/make/stub_includes/opengl/GL3/gl3.h +++ b/make/stub_includes/opengl/GL3/gl3.h @@ -1762,7 +1762,7 @@ GLAPI void APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *par GLAPI void APIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); GLAPI void APIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); GLAPI GLboolean APIENTRY glIsEnabled (GLenum cap); -GLAPI void APIENTRY glDepthRange (GLclampd near, GLclampd far); +GLAPI void APIENTRY glDepthRange (GLclampd zNear, GLclampd zFar); GLAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); #endif /* GL3_PROTOTYPES */ typedef void (APIENTRYP PFNGLCULLFACEPROC) (GLenum mode); @@ -2900,8 +2900,8 @@ typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index GLAPI void APIENTRY glReleaseShaderCompiler (void); GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length); GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); -GLAPI void APIENTRY glDepthRangef (GLclampf n, GLclampf f); -GLAPI void APIENTRY glClearDepthf (GLclampf d); +GLAPI void APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar); +GLAPI void APIENTRY glClearDepthf (GLclampf depth); #endif /* GL3_PROTOTYPES */ typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void); typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length); diff --git a/make/stub_includes/opengl/GL3/glplatform.h b/make/stub_includes/opengl/GL3/glplatform.h index d1ffba5fa..958d95cb1 100644 --- a/make/stub_includes/opengl/GL3/glplatform.h +++ b/make/stub_includes/opengl/GL3/glplatform.h @@ -20,7 +20,9 @@ # define APIENTRY __stdcall #else /* non-Windows compilation */ -# define GLAPI extern +# ifndef GLAPI +# define GLAPI extern +# endif # define APIENTRY #endif /* WIN32 / CYGWIN bracket */ |