asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable GLES2 debugging on iOS, fixes build

Browse source 
Could be readded by someone who knows how to access an API
similar to EGL on iOS.
This commit is contained in:
Rémi Verschelde 2018-10-02 16:34:31 +02:00
parent 3c62aa778d
commit 63e1c6dce3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/gles2/rasterizer_gles2.cpp
View file

@ -64,14 +64,14 @@
#define GLAPIENTRY #define GLAPIENTRY
#endif #endif
#ifndef GLES_OVER_GL #if !defined(GLES_OVER_GL) && !defined(IPHONE_ENABLED)
// Used for debugging on mobile, but not iOS as EGL is not available
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include <GLES2/gl2platform.h> #include <GLES2/gl2platform.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#endif #endif
static void GLAPIENTRY _gl_debug_print(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const GLvoid *userParam) { static void GLAPIENTRY _gl_debug_print(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const GLvoid *userParam) {
@ -189,7 +189,7 @@ Error RasterizerGLES2::is_viable() {
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
} }
} }
#endif #endif // GLES_OVER_GL
#endif // GLAD_ENABLED #endif // GLAD_ENABLED
@ -228,6 +228,7 @@ void RasterizerGLES2::initialize() {
*/ */
} }
#else #else
#ifndef IPHONE_ENABLED
if (OS::get_singleton()->is_stdout_verbose()) { if (OS::get_singleton()->is_stdout_verbose()) {
DebugMessageCallbackARB callback = (DebugMessageCallbackARB)eglGetProcAddress("glDebugMessageCallback"); DebugMessageCallbackARB callback = (DebugMessageCallbackARB)eglGetProcAddress("glDebugMessageCallback");
if (!callback) { if (!callback) {
@ -242,8 +243,8 @@ void RasterizerGLES2::initialize() {
glEnable(_EXT_DEBUG_OUTPUT); glEnable(_EXT_DEBUG_OUTPUT);
} }
} }
#endif // !IPHONE_ENABLED
#endif #endif // GLES_OVER_GL
const GLubyte *renderer = glGetString(GL_RENDERER); const GLubyte *renderer = glGetString(GL_RENDERER);
print_line("OpenGL ES 2.0 Renderer: " + String((const char *)renderer)); print_line("OpenGL ES 2.0 Renderer: " + String((const char *)renderer));