diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-03-02 13:37:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-02 13:37:28 +0100 |
| commit | 802c5f14c26cf7c0d22607e931563eb5e8347ce4 (patch) | |
| tree | 76589c8c070059a7b394410a0011d0c716142e05 /drivers | |
| parent | 4ccc8e57f98024b913bafbf290b4093658674e68 (diff) | |
| parent | a5a4f3714b9f8f374f3aa7feadd62178e98c9f74 (diff) | |
Merge pull request #17175 from bruvzg/gles2_macos_support
[GLES2] Adds GLES2 renderer support on macOS.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles2/rasterizer_gles2.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index b357073ba5..187395d467 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -161,7 +161,7 @@ void RasterizerGLES2::initialize() { } #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.. +// FIXME glDebugMessageCallbackARB does not seem to work on Mac OS X and opengl 2, this may be an issue with our opengl canvas.. #else if (true || OS::get_singleton()->is_stdout_verbose()) { glEnable(_EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB); @@ -174,6 +174,9 @@ void RasterizerGLES2::initialize() { // For debugging #ifdef GLES_OVER_GL +#ifdef __APPLE__ +// FIXME glDebugMessageCallbackARB does not seem to work on Mac OS X and opengl 2, this may be an issue with our opengl canvas.. +#else glDebugMessageControlARB(_EXT_DEBUG_SOURCE_API_ARB, _EXT_DEBUG_TYPE_ERROR_ARB, _EXT_DEBUG_SEVERITY_HIGH_ARB, 0, NULL, GL_TRUE); glDebugMessageControlARB(_EXT_DEBUG_SOURCE_API_ARB, _EXT_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB, _EXT_DEBUG_SEVERITY_HIGH_ARB, 0, NULL, GL_TRUE); glDebugMessageControlARB(_EXT_DEBUG_SOURCE_API_ARB, _EXT_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB, _EXT_DEBUG_SEVERITY_HIGH_ARB, 0, NULL, GL_TRUE); @@ -181,6 +184,7 @@ void RasterizerGLES2::initialize() { glDebugMessageControlARB(_EXT_DEBUG_SOURCE_API_ARB, _EXT_DEBUG_TYPE_PERFORMANCE_ARB, _EXT_DEBUG_SEVERITY_HIGH_ARB, 0, NULL, GL_TRUE); glDebugMessageControlARB(_EXT_DEBUG_SOURCE_API_ARB, _EXT_DEBUG_TYPE_OTHER_ARB, _EXT_DEBUG_SEVERITY_HIGH_ARB, 0, NULL, GL_TRUE); #endif +#endif /* glDebugMessageInsertARB( GL_DEBUG_SOURCE_API_ARB, GL_DEBUG_TYPE_OTHER_ARB, 1, |