From c5ebf384900ca595e67ff103d44e88acfbb0344a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 23 Nov 2018 21:05:50 +0100 Subject: [PATCH] Prevent GLAPIENTRY redefine in rasterizer, now included in glad.h We otherwise had conflicting defines since 1a41daf3. --- drivers/gles2/rasterizer_gles2.cpp | 4 +++- drivers/gles3/rasterizer_gles3.cpp | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 175587b1bbe..f49dbfeabb3 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -58,11 +58,13 @@ #define _EXT_DEBUG_SEVERITY_LOW_ARB 0x9148 #define _EXT_DEBUG_OUTPUT 0x92E0 -#if (defined WINDOWS_ENABLED) && !(defined UWP_ENABLED) +#ifndef GLAPIENTRY +#if defined(WINDOWS_ENABLED) && !defined(UWP_ENABLED) #define GLAPIENTRY APIENTRY #else #define GLAPIENTRY #endif +#endif #if !defined(GLES_OVER_GL) && !defined(IPHONE_ENABLED) // Used for debugging on mobile, but not iOS as EGL is not available diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp index 41ce5e7c475..8242d214d31 100644 --- a/drivers/gles3/rasterizer_gles3.cpp +++ b/drivers/gles3/rasterizer_gles3.cpp @@ -79,12 +79,6 @@ RasterizerScene *RasterizerGLES3::get_scene() { #ifdef GLAD_ENABLED // Restricting to GLAD as only used in initialize() with GLAD_GL_ARB_debug_output -#if (defined WINDOWS_ENABLED) && !(defined UWP_ENABLED) -#define GLAPIENTRY APIENTRY -#else -#define GLAPIENTRY -#endif - static void GLAPIENTRY _gl_debug_print(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const GLvoid *userParam) { if (type == _EXT_DEBUG_TYPE_OTHER_ARB)