diff options
| author | BastiaanOlij <mux213@gmail.com> | 2017-01-04 21:56:56 +1100 |
|---|---|---|
| committer | BastiaanOlij <mux213@gmail.com> | 2017-01-04 23:34:02 +1100 |
| commit | 55d425807f6f1784d6ffd84586ae7efd77c1b352 (patch) | |
| tree | d0bf39db6098ef54b502ba157c406f1d107e917c /drivers | |
| parent | 76c2e8583e70e8c976a306e77a40e8e7226aa249 (diff) | |
First set of changes to fix compilation errors and initialise the gles3 renderer for Mac OS X. Still broken at this point.
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 7bb465f0ec..3653abe71a 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 0998d9c423..866091187d 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 |