summaryrefslogtreecommitdiffstats
path: root/make/stub_includes/opengl/GLES2/gl2ext.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/gl2ext.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/gl2ext.h')
-rwxr-xr-xmake/stub_includes/opengl/GLES2/gl2ext.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/make/stub_includes/opengl/GLES2/gl2ext.h b/make/stub_includes/opengl/GLES2/gl2ext.h
index 8580e2bdf..e3bbede8a 100755
--- a/make/stub_includes/opengl/GLES2/gl2ext.h
+++ b/make/stub_includes/opengl/GLES2/gl2ext.h
@@ -61,9 +61,7 @@ extern "C" {
#define GL_NVIDIA_PLATFORM_BINARY_NV 0x890B
-#define GL_OES_EGL_image 1
-
-#ifdef GL_OES_EGL_image
+#ifndef GL_OES_EGL_image
/** sgothel: wrong defines and/or numbers:
*
#define GL_TEXTURE_2D_OES 0x1
@@ -76,12 +74,17 @@ extern "C" {
#define GL_RENDERBUFFER_OES 0x9
#define GL_TEXTURE_RECTANGLE_NV_OES 0xb
*/
+#endif /* GL_OES_EGL_image */
+#ifndef GL_OES_EGL_image
typedef void *GLeglImageOES;
+#endif /* GL_OES_EGL_image */
+
+#ifndef GL_OES_EGL_image
+#define GL_OES_EGL_image 1
GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image);
#ifdef GL_GLEXT_PROTOTYPES
typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
-
#endif
#endif