diff options
Diffstat (limited to 'make/stub_includes/opengl')
| -rw-r--r-- | make/stub_includes/opengl/GL/gl-platform.h | 10 | ||||
| -rw-r--r-- | make/stub_includes/opengl/GL/glext.h | 12 | ||||
| -rw-r--r-- | make/stub_includes/opengl/GL/wglext.h | 6 | ||||
| -rw-r--r-- | make/stub_includes/opengl/GLES2/gl2ext.h | 2 |
4 files changed, 26 insertions, 4 deletions
diff --git a/make/stub_includes/opengl/GL/gl-platform.h b/make/stub_includes/opengl/GL/gl-platform.h index 58df2cfd3..d07fd92ce 100644 --- a/make/stub_includes/opengl/GL/gl-platform.h +++ b/make/stub_includes/opengl/GL/gl-platform.h @@ -21,13 +21,17 @@ # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern # endif /* _STATIC_MESA support */ -# define APIENTRY __stdcall +# ifndef APIENTRY +# define APIENTRY __stdcall +# endif /* APIENTRY */ #else /* non-Windows compilation */ # ifndef GLAPI # define GLAPI extern # endif -# define APIENTRY +# ifndef APIENTRY +# define APIENTRY +# endif /* APIENTRY */ #endif /* WIN32 / CYGWIN bracket */ #if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) @@ -47,9 +51,11 @@ #include <windows.h> #endif +/** #if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__) #include <gl/mesa_wgl.h> #endif +*/ #if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED #pragma import on diff --git a/make/stub_includes/opengl/GL/glext.h b/make/stub_includes/opengl/GL/glext.h index cba6c98fb..b4851803f 100644 --- a/make/stub_includes/opengl/GL/glext.h +++ b/make/stub_includes/opengl/GL/glext.h @@ -54,12 +54,14 @@ extern "C" { #ifndef GL_ARB_imaging #define GL_ARB_imaging 1 +#ifndef GL_VERSION_1_0 typedef unsigned int GLenum; typedef int GLsizei; typedef void GLvoid; typedef float GLfloat; typedef int GLint; typedef unsigned char GLboolean; +#endif /* GL_VERSION_1_0 */ #define GL_CONSTANT_COLOR 0x8001 #define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 #define GL_CONSTANT_ALPHA 0x8003 @@ -1497,7 +1499,7 @@ GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIn #define GL_VERSION_3_2 1 #ifndef GLEXT_64_TYPES_DEFINED /* This code block is duplicated in glxext.h, so must be protected */ -#define GLEXT_64_TYPES_DEFINED +#define GLEXT_64_TYPES_DEFINED 1 /* 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 @@ -1531,10 +1533,10 @@ typedef unsigned __int64 uint64_t; /* Fallback if nothing above works */ #include <inttypes.h> #endif -#endif typedef int64_t GLint64; typedef struct __GLsync *GLsync; typedef uint64_t GLuint64; +#endif /* GLEXT_64_TYPES_DEFINED */ #define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 #define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 #define GL_LINES_ADJACENCY 0x000A @@ -4650,7 +4652,9 @@ GLAPI GLbitfield APIENTRY glQueryMatrixxOES (GLfixed *mantissa, GLint *exponent) #ifndef GL_OES_single_precision #define GL_OES_single_precision 1 +#ifndef GL_VERSION_1_0 typedef float GLclampf; +#endif /* GL_VERSION_1_0 */ typedef void (APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth); typedef void (APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation); typedef void (APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f); @@ -5846,7 +5850,9 @@ GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params); #ifndef GL_EXT_depth_bounds_test #define GL_EXT_depth_bounds_test 1 +#ifndef GL_VERSION_1_0 typedef double GLclampd; +#endif /* GL_VERSION_1_0 */ #define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 #define GL_DEPTH_BOUNDS_EXT 0x8891 typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax); @@ -7357,8 +7363,10 @@ GLAPI void APIENTRY glTextureNormalEXT (GLenum mode); #ifndef GL_EXT_timer_query #define GL_EXT_timer_query 1 +#ifndef GLEXT_64_TYPES_DEFINED typedef int64_t GLint64EXT; typedef uint64_t GLuint64EXT; +#endif /* GLEXT_64_TYPES_DEFINED */ #define GL_TIME_ELAPSED_EXT 0x88BF typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params); typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params); diff --git a/make/stub_includes/opengl/GL/wglext.h b/make/stub_includes/opengl/GL/wglext.h index ed5d6a7db..df5abb22b 100644 --- a/make/stub_includes/opengl/GL/wglext.h +++ b/make/stub_includes/opengl/GL/wglext.h @@ -697,6 +697,7 @@ BOOL WINAPI wglDeleteDCNV (HDC hdc); #define WGL_COLOR_SAMPLES_NV 0x20B9 #endif /* WGL_NV_multisample_coverage */ +#if 0 /* problems on Windows ..*/ #ifndef WGL_NV_present_video #define WGL_NV_present_video 1 #ifndef SKIP_WGL_HANDLE_DEFINITIONS @@ -712,6 +713,7 @@ BOOL WINAPI wglBindVideoDeviceNV (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUT BOOL WINAPI wglQueryCurrentContextNV (int iAttribute, int *piValue); #endif #endif /* WGL_NV_present_video */ +#endif /* problems on Windows ..*/ #ifndef WGL_NV_render_depth_texture #define WGL_NV_render_depth_texture 1 @@ -757,6 +759,7 @@ void WINAPI wglFreeMemoryNV (void *pointer); #endif #endif /* WGL_NV_vertex_array_range */ +#if 0 /* problems on Windows ..*/ #ifndef WGL_NV_video_capture #define WGL_NV_video_capture 1 #ifndef SKIP_WGL_HANDLE_DEFINITIONS @@ -777,7 +780,9 @@ BOOL WINAPI wglQueryVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice, BOOL WINAPI wglReleaseVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice); #endif #endif /* WGL_NV_video_capture */ +#endif /* problems on Windows ..*/ +#if 0 /* problems on Windows ..*/ #ifndef WGL_NV_video_output #define WGL_NV_video_output 1 #ifndef SKIP_WGL_HANDLE_DEFINITIONS @@ -811,6 +816,7 @@ BOOL WINAPI wglSendPbufferToVideoNV (HPBUFFERARB hPbuffer, int iBufferType, unsi BOOL WINAPI wglGetVideoInfoNV (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); #endif #endif /* WGL_NV_video_output */ +#endif /* problems on Windows ..*/ #ifndef WGL_OML_sync_control #define WGL_OML_sync_control 1 diff --git a/make/stub_includes/opengl/GLES2/gl2ext.h b/make/stub_includes/opengl/GLES2/gl2ext.h index b658fc8ba..c3c909a61 100644 --- a/make/stub_includes/opengl/GLES2/gl2ext.h +++ b/make/stub_includes/opengl/GLES2/gl2ext.h @@ -1571,6 +1571,7 @@ GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target); GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params); GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params); #endif +#ifndef GL_EXT_disjoint_timer_query typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids); typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids); typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id); @@ -1578,6 +1579,7 @@ typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id); typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target); typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params); typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params); +#endif /* GL_EXT_disjoint_timer_query */ #endif /* GL_EXT_read_format_bgra */ |