diff options
| author | Michael Bien <[email protected]> | 2009-08-08 21:43:30 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2009-08-08 21:43:30 +0200 |
| commit | 8ef9d7364a942c19ec5e1f306e08193e83f4fea6 (patch) | |
| tree | 6dcf95825d2933992199a7062b15e38d3f721c95 /make/stub_includes/opengl/GLES2/gl2ext.h | |
| parent | 2a8e9876ca4567de3b08813c280d006f9b2c32e6 (diff) | |
| parent | fb3e50b4e7e11df911a83ab7966cf8f293c20da2 (diff) | |
Merge branch 'master' of ssh://[email protected]/jogl~jogl-git
Diffstat (limited to 'make/stub_includes/opengl/GLES2/gl2ext.h')
| -rwxr-xr-x | make/stub_includes/opengl/GLES2/gl2ext.h | 11 |
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 |