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

9 files changed, 67 insertions, 57 deletions

diff --git a/make/stub_includes/opengl/GL/gl.h b/make/stub_includes/opengl/GL/gl.h
index 142e03510..0fe44172e 100644
--- a/make/stub_includes/opengl/GL/gl.h
+++ b/make/stub_includes/opengl/GL/gl.h
@@ -694,7 +694,7 @@ GLAPI void GLAPIENTRY glDepthFunc( GLenum func );
 
 GLAPI void GLAPIENTRY glDepthMask( GLboolean flag );
 
-GLAPI void GLAPIENTRY glDepthRange( GLclampd near_val, GLclampd far_val );
+GLAPI void GLAPIENTRY glDepthRange( GLclampd zNear, GLclampd zFar );
 
 
 /*
diff --git a/make/stub_includes/opengl/GL/glext.h b/make/stub_includes/opengl/GL/glext.h
index 74388ff66..846394048 100644
--- a/make/stub_includes/opengl/GL/glext.h
+++ b/make/stub_includes/opengl/GL/glext.h
@@ -6964,8 +6964,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 /* GL_GLEXT_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/GL/glplatform.h b/make/stub_includes/opengl/GL/glplatform.h
index d922eaa1a..5d42943d7 100644
--- a/make/stub_includes/opengl/GL/glplatform.h
+++ b/make/stub_includes/opengl/GL/glplatform.h
@@ -24,7 +24,9 @@
 #  define GLAPIENTRY __stdcall
 #else
 /* non-Windows compilation */
-#  define GLAPI extern
+#  ifndef GLAPI
+#    define GLAPI extern
+#  endif
 #  define GLAPIENTRY
 #endif /* WIN32 / CYGWIN bracket */
 
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 */
 
diff --git a/make/stub_includes/opengl/GLES/gl.h b/make/stub_includes/opengl/GLES/gl.h
index f190be211..0d152474b 100644
--- a/make/stub_includes/opengl/GLES/gl.h
+++ b/make/stub_includes/opengl/GLES/gl.h
@@ -612,7 +612,7 @@ GL_API void GL_APIENTRY glGetClipPlanef (GLenum pname, const GLfloat * eqn);
 GL_API void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat *params);
 GL_API void GL_APIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params);
 GL_API void GL_APIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params);
-GL_API void GL_APIENTRY glGetTexEnvfv (GLenum env, GLenum pname, GLfloat *params);
+GL_API void GL_APIENTRY glGetTexEnvfv (GLenum tenv, GLenum pname, GLfloat *params);
 GL_API void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
 GL_API void GL_APIENTRY glLightModelf (GLenum pname, GLfloat param);
 GL_API void GL_APIENTRY glLightModelfv (GLenum pname, const GLfloat *params);
@@ -697,8 +697,8 @@ GL_API void GL_APIENTRY glGetLightxv (GLenum light, GLenum pname, GLfixed *param
 GL_API void GL_APIENTRY glGetMaterialxv (GLenum face, GLenum pname, GLfixed *params);
 GL_API void GL_APIENTRY glGetPointerv (GLenum pname, GLvoid **params);
 GL_API const GLubyte * GL_APIENTRY glGetString (GLenum name);
-GL_API void GL_APIENTRY glGetTexEnviv (GLenum env, GLenum pname, GLint *params);
-GL_API void GL_APIENTRY glGetTexEnvxv (GLenum env, GLenum pname, GLfixed *params);
+GL_API void GL_APIENTRY glGetTexEnviv (GLenum tenv, GLenum pname, GLint *params);
+GL_API void GL_APIENTRY glGetTexEnvxv (GLenum tenv, GLenum pname, GLfixed *params);
 GL_API void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
 GL_API void GL_APIENTRY glGetTexParameterxv (GLenum target, GLenum pname, GLfixed *params);
 GL_API void GL_APIENTRY glHint (GLenum target, GLenum mode);
diff --git a/make/stub_includes/opengl/GLES2/gl2.h b/make/stub_includes/opengl/GLES2/gl2.h
index f9ac07385..03807e3ca 100644
--- a/make/stub_includes/opengl/GLES2/gl2.h
+++ b/make/stub_includes/opengl/GLES2/gl2.h
@@ -459,6 +459,7 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT         0x8CD6
 #define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
 #define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS            0x8CDA
 #define GL_FRAMEBUFFER_UNSUPPORTED                   0x8CDD
 
 #define GL_FRAMEBUFFER_BINDING            0x8CA6
diff --git a/make/stub_includes/opengl/GLES2/gl2ext.h b/make/stub_includes/opengl/GLES2/gl2ext.h
index 2961210dd..25fea47aa 100644
--- a/make/stub_includes/opengl/GLES2/gl2ext.h
+++ b/make/stub_includes/opengl/GLES2/gl2ext.h
@@ -294,6 +294,44 @@ typedef void* GLeglImageOES;
 /* GL_EXT_shader_texture_lod */
 /* No new tokens introduced by this extension. */
 
+/* GL_EXT_framebuffer_mixed_formats */
+#ifndef GL_EXT_framebuffer_mixed_formats
+#define GL_EXT_framebuffer_mixed_formats 1
+#endif
+
+/* GL_EXT_packed_float */
+#ifndef GL_EXT_packed_float
+#define GL_R11F_G11F_B10F_EXT                           0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT             0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT                   0x8C3C
+#endif
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#endif
+
+/* GL_EXT_texture_array */
+#ifndef GL_EXT_texture_array
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#endif
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#endif
+
+/* GL_EXT_texture_compression_s3tc */
+#ifndef GL_EXT_texture_compression_s3tc
+/* GL_COMPRESSED_RGB_S3TC_DXT1_EXT defined in GL_EXT_texture_compression_dxt1 already. */
+/* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT defined in GL_EXT_texture_compression_dxt1 already. */
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_EXT_texture_compression_s3tc 1
+#endif
+
 /*------------------------------------------------------------------------*
  * IMG extension tokens
  *------------------------------------------------------------------------*/
diff --git a/make/stub_includes/opengl/gl-64bit-types.h b/make/stub_includes/opengl/gl-64bit-types.h
index b248933fe..f40eeae55 100644
--- a/make/stub_includes/opengl/gl-64bit-types.h
+++ b/make/stub_includes/opengl/gl-64bit-types.h
@@ -1,54 +1,21 @@
 #ifndef __gl_64bit_types_h_
 #define __gl_64bit_types_h_
 
-#ifndef GL_64_TYPES_DEFINED
-    /* This code block is duplicated in glext.h, so must be protected */
-    #define GL_64_TYPES_DEFINED
-    /* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-    /* (as used in the GL_EXT_timer_query extension). */
-    #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-        #include <inttypes.h>
-    #elif defined(__sun__)
-        #include <inttypes.h>
-        #if defined(__STDC__)
-            #if defined(__arch64__)
-                typedef long int int64_t;
-                typedef unsigned long int uint64_t;
-            #else
-                typedef long long int int64_t;
-                typedef unsigned long long int uint64_t;
-            #endif /* __arch64__ */
-        #endif /* __STDC__ */
-    #elif defined( __VMS )
-        #include <inttypes.h>
-    #elif defined(__SCO__) || defined(__USLC__)
-        #include <stdint.h>
-    #elif defined(__UNIXOS2__) || defined(__SOL64__)
-        typedef long int int32_t;
-        typedef unsigned long int uint32_t;
-        typedef long long int int64_t;
-        typedef unsigned long long int uint64_t;
-    #elif defined(WIN32) && defined(__GNUC__)
-        #include <stdint.h>
-    #elif defined(_WIN32)
-        typedef __int32 int32_t;
-        typedef unsigned __int32 uint32_t;
-        typedef __int64 int64_t;
-        typedef unsigned __int64 uint64_t;
-    #else
-        #include <inttypes.h>     /* Fallback option */
+#include <KHR/khrplatform.h>
+
+#ifdef KHRONOS_SUPPORT_INT64
+
+    #ifndef GL_EXT_timer_query
+    typedef khronos_int64_t GLint64EXT;
+    typedef khronos_uint64_t GLuint64EXT;
     #endif
-#endif
 
-#ifndef GL_EXT_timer_query
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
+    #ifndef GL_ARB_sync
+    typedef khronos_int64_t GLint64;
+    typedef khronos_uint64_t GLuint64;
+    typedef struct __GLsync *GLsync;
+    #endif
 
-#ifndef GL_ARB_sync
-typedef int64_t GLint64;
-typedef uint64_t GLuint64;
-typedef struct __GLsync *GLsync;
-#endif
+#endif /* KHRONOS_SUPPORT_INT64 */
 
 #endif /* __gl_64bit_types_h_ */