Try to fix macro definition order problem with OpenGL code

minetest · Apr 15, 2024 · 38cacfa · 38cacfa
1 parent 13e271c
commit 38cacfa
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/irr/src/COGLESCommon.h b/irr/src/COGLESCommon.h
@@ -90,6 +90,9 @@ typedef char GLchar;
 // to check if this header is in the current compile unit (different GL implementation used different "GLCommon" headers in Irrlicht
 #define IRR_COMPILE_GLES_COMMON
 
+// macro used with COGLES1Driver
+#define TEST_GL_ERROR(cls) (cls)->testGLError(__LINE__)
+
 namespace irr
 {
 namespace video

diff --git a/irr/src/COpenGLCommon.h b/irr/src/COpenGLCommon.h
@@ -19,6 +19,9 @@
 // To check if this header is in the current compile unit (different GL driver implementations use different "GLCommon" headers in Irrlicht)
 #define IRR_COMPILE_GL_COMMON
 
+// macro used with COpenGLDriver
+#define TEST_GL_ERROR(cls) (cls)->testGLError(__LINE__)
+
 namespace irr
 {
 namespace video

diff --git a/irr/src/COpenGLDriver.h b/irr/src/COpenGLDriver.h
@@ -22,8 +22,6 @@ class CIrrDeviceMacOSX;
 #include "COpenGLExtensionHandler.h"
 #include "IContextManager.h"
 
-#define TEST_GL_ERROR(cls) (cls)->testGLError(__LINE__)
-
 namespace irr
 {
 

diff --git a/irr/src/CSDLManager.cpp b/irr/src/CSDLManager.cpp
@@ -7,7 +7,6 @@
 #if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
 
 #include "CIrrDeviceSDL.h"
-#include "COpenGLCommon.h"
 
 namespace irr
 {

diff --git a/irr/src/OpenGL/Common.h b/irr/src/OpenGL/Common.h
@@ -14,6 +14,9 @@
 #include "vendor/gl.h"
 #endif
 
+// macro used with COpenGL3DriverBase
+#define TEST_GL_ERROR(cls) (cls)->testGLError(__FILE__, __LINE__)
+
 namespace irr
 {
 namespace video

diff --git a/irr/src/OpenGL/Driver.h b/irr/src/OpenGL/Driver.h
@@ -16,8 +16,6 @@
 #include "ExtensionHandler.h"
 #include "IContextManager.h"
 
-#define TEST_GL_ERROR(cls) (cls)->testGLError(__FILE__, __LINE__)
-
 namespace irr
 {
 namespace video