Merge pull request #23936 from akien-mga/glad-glapientry

Remove GLAPIENTRY defines from rasterizer, now included in glad.h

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

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)