diff options
| author | Juan Linietsky | 2017-01-05 09:18:03 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-05 09:18:03 -0300 |
| commit | 495d059a744b268b0355d0cbfbb9ef30fec865e2 (patch) | |
| tree | 96c7cc2c4bcf3a1f2c62a18ddbe2aaa7a42a44ed /drivers | |
| parent | 0f7af4ea51744cda23c4d3c7481f9c332973d1d4 (diff) | |
| parent | e39a6242ac1c503a3c35f40c8a44296fa9df28cb (diff) | |
| download | godot-495d059a744b268b0355d0cbfbb9ef30fec865e2.tar.gz godot-495d059a744b268b0355d0cbfbb9ef30fec865e2.tar.zst godot-495d059a744b268b0355d0cbfbb9ef30fec865e2.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gl_context/glad/glad.h | 14 | ||||
| -rw-r--r-- | drivers/gles3/rasterizer_gles3.cpp | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gl_context/glad/glad.h b/drivers/gl_context/glad/glad.h index 7bb465f0e..3653abe71 100644 --- a/drivers/gl_context/glad/glad.h +++ b/drivers/gl_context/glad/glad.h @@ -150,12 +150,26 @@ typedef unsigned int GLhandleARB; typedef unsigned short GLhalfARB; typedef unsigned short GLhalf; typedef GLint GLfixed; +// Temporary work around for upstream issue: https://github.com/Dav1dde/glad/issues/70 +// Originally fixed by Algorithmus, reapplied in master +#if defined(__APPLE__) +typedef long GLintptr; +typedef long GLsizeiptr; +#else typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLsizeiptr; +#endif typedef int64_t GLint64; typedef uint64_t GLuint64; +// Temporary work around for upstream issue: https://github.com/Dav1dde/glad/issues/70 +// Originally fixed by Algorithmus, reapplied in master +#if defined(__APPLE__) +typedef long GLintptrARB; +typedef long GLsizeiptrARB; +#else typedef ptrdiff_t GLintptrARB; typedef ptrdiff_t GLsizeiptrARB; +#endif typedef int64_t GLint64EXT; typedef uint64_t GLuint64EXT; typedef struct __GLsync *GLsync; diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp index 7d5f488ed..efad6c7e5 100644 --- a/drivers/gles3/rasterizer_gles3.cpp +++ b/drivers/gles3/rasterizer_gles3.cpp @@ -136,9 +136,13 @@ void RasterizerGLES3::initialize() { ERR_PRINT("Error initializing GLAD"); } +#ifdef __APPLE__ + // FIXME glDebugMessageCallbackARB does not seem to work on Mac OS X and opengl 3, this may be an issue with our opengl canvas.. +#else glEnable(_EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB); glDebugMessageCallbackARB(_gl_debug_print, NULL); glEnable(_EXT_DEBUG_OUTPUT); +#endif #endif |