summaryrefslogtreecommitdiffstats
path: root/make/stub_includes/opengl/GLES2/gl2.h
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2009-08-05 11:55:14 -0700
committerSven Gothel <[email protected]>2009-08-05 11:55:14 -0700
commit0e998e8416b38b084b517c299061856b7ff963d7 (patch)
tree2cc191d7ab3d42b0316838d756019f45b62b0061 /make/stub_includes/opengl/GLES2/gl2.h
parentd741053ed1a422b75d6aeac28be7c5cdba4c4564 (diff)
Update GlueGen to 7dc9c5601d5689dcbc003ca51cfe826942ea3e6b (latest)
- Fixes for OpenGL 3.2 - More strict define/function checking - Better documentation in source code: extension relation - GL extension marker exclusion is done by GlueGen now - Adapted gluegen cfg files Added OpenGL 3.2 extensions for GL3 Revalidation of all OpenGL 2.0/3.0/3.1 and 3.2 extensions GL2GL3 based on OpenGL 2.0/3.0 headers EGL shares common egl-common.cfg file Removed experimental java system property 'jogl.GLContext.3_2', try a 3.2 context in case of GL3. X11GLXContext: - Always try to make a created context current, to verify it's usability. This is different than under WGL. - Temporary removed usage: GLX.GLX_CONTEXT_PROFILE_MASK_ARB NV driver bug.
Diffstat (limited to 'make/stub_includes/opengl/GLES2/gl2.h')
-rwxr-xr-xmake/stub_includes/opengl/GLES2/gl2.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/make/stub_includes/opengl/GLES2/gl2.h b/make/stub_includes/opengl/GLES2/gl2.h
index 9c68b1e7a..44338000e 100755
--- a/make/stub_includes/opengl/GLES2/gl2.h
+++ b/make/stub_includes/opengl/GLES2/gl2.h
@@ -99,8 +99,7 @@ typedef int GLclampx;
typedef int GLintptr;
typedef int GLsizeiptr;
-/* OpenGL ES core versions */
-#define GL_ES_VERSION_2_0 1
+#ifndef GL_ES_VERSION_2_0
/* ClearBufferMask */
#define GL_DEPTH_BUFFER_BIT 0x00000100
@@ -532,10 +531,14 @@ typedef int GLsizeiptr;
#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506
+#endif /* GL_ES_VERSION_2_0 */
+
/*-------------------------------------------------------------------------
* GL core functions.
*-----------------------------------------------------------------------*/
+#ifndef GL_ES_VERSION_2_0
+#define GL_ES_VERSION_2_0 1
GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture);
GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const char* name);
@@ -678,6 +681,7 @@ GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GL
GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values);
GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr);
GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+#endif /* GL_ES_VERSION_2_0 */
#ifdef __cplusplus
}