From f012f5214c17aa30a4576038ea7ab00ac6ee9458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Thu, 17 Mar 2016 09:39:54 -0700 Subject: [PATCH] OSX: Fixed glext.h. --- 3rdparty/khronos/gl/glext.h | 5 +++++ src/glimports.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/3rdparty/khronos/gl/glext.h b/3rdparty/khronos/gl/glext.h index e9807871d..b7af89773 100644 --- a/3rdparty/khronos/gl/glext.h +++ b/3rdparty/khronos/gl/glext.h @@ -465,8 +465,13 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode); #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include +#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1090) +typedef long GLsizeiptr; +typedef long GLintptr; +#else typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLintptr; +#endif #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 #define GL_QUERY_COUNTER_BITS 0x8864 diff --git a/src/glimports.h b/src/glimports.h index ca5d7e87f..de3b1c7b7 100644 --- a/src/glimports.h +++ b/src/glimports.h @@ -333,9 +333,9 @@ GL_IMPORT______(true, PFNGLGETQUERYOBJECTUI64VPROC, glGetQueryObj GL_IMPORT______(false, PFNGLGETSHADERIVPROC, glGetShaderiv); GL_IMPORT______(false, PFNGLGETSHADERINFOLOGPROC, glGetShaderInfoLog); GL_IMPORT______(false, PFNGLGETSTRINGPROC, glGetString); -GL_IMPORT______(true, PFNGLGETSTRINGIPROC, glGetStringi); GL_IMPORT______(false, PFNGLGETUNIFORMLOCATIONPROC, glGetUniformLocation); #if BGFX_CONFIG_RENDERER_OPENGL || !(BGFX_CONFIG_RENDERER_OPENGLES < 30) +GL_IMPORT______(true, PFNGLGETSTRINGIPROC, glGetStringi); GL_IMPORT______(true, PFNGLINVALIDATEFRAMEBUFFERPROC, glInvalidateFramebuffer); #endif // !(BGFX_CONFIG_RENDERER_OPENGLES < 30) GL_IMPORT______(false, PFNGLLINKPROGRAMPROC, glLinkProgram); @@ -469,7 +469,7 @@ GL_IMPORT_KHR__(true, PFNGLGETDEBUGMESSAGELOGPROC, glGetDebugMes GL_IMPORT_____x(true, PFNGLGETCOMPRESSEDTEXIMAGEPROC, glGetCompressedTexImage); GL_IMPORT_____x(true, PFNGLGETTEXIMAGEPROC, glGetTexImage); -# if BGFX_CONFIG_RENDERER_OPENGLES < 30 +# if BGFX_CONFIG_RENDERER_OPENGLES && BGFX_CONFIG_RENDERER_OPENGLES < 30 GL_IMPORT______(true, PFNGLGETSTRINGIPROC, glGetStringi); GL_IMPORT_OES__(true, PFNGLTEXIMAGE3DPROC, glTexImage3D); @@ -619,7 +619,7 @@ GL_IMPORT______(true, PFNGLMULTIDRAWELEMENTSINDIRECTPROC, glMultiDrawEl GL_IMPORT______(true, PFNGLINVALIDATEFRAMEBUFFERPROC, glInvalidateFramebuffer); -# endif // BGFX_CONFIG_RENDERER_OPENGLES < 30 +# endif // BGFX_CONFIG_RENDERER_OPENGLES && BGFX_CONFIG_RENDERER_OPENGLES < 30 #endif // !BGFX_CONFIG_RENDERER_OPENGL #undef GL_IMPORT_TYPEDEFS