Index: third_party/mesa/MesaLib/include/GL/gl.h |
=================================================================== |
--- third_party/mesa/MesaLib/include/GL/gl.h (revision 63788) |
+++ third_party/mesa/MesaLib/include/GL/gl.h (working copy) |
@@ -71,7 +71,7 @@ |
#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */ |
# define GLAPI extern |
# define GLAPIENTRY __stdcall |
-#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 |
+#elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) |
# define GLAPI __attribute__((visibility("default"))) |
# define GLAPIENTRY |
#endif /* WIN32 && !CYGWIN */ |
@@ -91,7 +91,9 @@ |
* glut.h or gl.h. |
*/ |
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) |
+#ifndef WIN32_LEAN_AND_MEAN |
#define WIN32_LEAN_AND_MEAN 1 |
+#endif |
#include <windows.h> |
#endif |
@@ -2199,7 +2201,22 @@ |
#endif /* GL_ATI_blend_equation_separate */ |
+/* GL_OES_EGL_image */ |
+#ifndef GL_OES_EGL_image |
+typedef void* GLeglImageOES; |
+#endif |
+#ifndef GL_OES_EGL_image |
+#define GL_OES_EGL_image 1 |
+#ifdef GL_GLEXT_PROTOTYPES |
+GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); |
+GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image); |
+#endif |
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); |
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image); |
+#endif |
+ |
+ |
/** |
** NOTE!!!!! If you add new functions to this file, or update |
** glext.h be sure to regenerate the gl_mangle.h file. See comments |