X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=glquake.h;h=46efbf0721fe6ac23334c0a201fe1f9502d918b4;hb=5534363cd693d1486e994d0fc2e21185fb2d9ff8;hp=21da68bcd533f4ebeacaceb9eac2f96c3953eec9;hpb=d3e8fe026cb474a05285472ff4172ae8565a215f;p=xonotic%2Fdarkplaces.git

diff --git a/glquake.h b/glquake.h
index 21da68bc..46efbf07 100644
--- a/glquake.h
+++ b/glquake.h
@@ -29,20 +29,6 @@
 
 //====================================================
 
-//#define DEBUGGL
-
-#ifdef DEBUGGL
-#ifdef USE_GLES2
-#define CHECKGLERROR {if (gl_paranoid.integer){if (gl_printcheckerror.integer) Con_Printf("CHECKGLERROR at %s:%d\n", __FILE__, __LINE__);gl_errornumber = glGetError();if (gl_errornumber) GL_PrintError(gl_errornumber, __FILE__, __LINE__);}}
-#else
-#define CHECKGLERROR {if (gl_paranoid.integer){if (gl_printcheckerror.integer) Con_Printf("CHECKGLERROR at %s:%d\n", __FILE__, __LINE__);gl_errornumber = qglGetError ? qglGetError() : 0;if (gl_errornumber) GL_PrintError(gl_errornumber, __FILE__, __LINE__);}}
-#endif //USE_GLES2
-extern int gl_errornumber;
-void GL_PrintError(int errornumber, const char *filename, int linenumber);
-#else
-#define CHECKGLERROR
-#endif //DEBUGGL
-
 #ifndef USE_GLES2
 // this is defined if the SDL_opengl.h is included
 #ifndef GL_ZERO
@@ -1048,6 +1034,29 @@ extern void (GLAPIENTRY *qglViewport)(GLint x, GLint y, GLsizei width, GLsizei h
 #define GL_TEXTURE_3D				0x806F
 
 #define GL_HALF_FLOAT                                    0x140B
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
 #define GL_NUM_EXTENSIONS                 0x821D
 
+
+//====================================================
+
+//#define DEBUGGL
+
+#ifdef DEBUGGL
+void GL_PrintError(GLenum errornumber, const char *filename, unsigned int linenumber);
+#define CHECKGLERROR { \
+	if (gl_paranoid.integer) { \
+		GLenum gl_errornumber; \
+		if (gl_printcheckerror.integer) \
+			Con_Printf("CHECKGLERROR at %s:%d\n", __FILE__, __LINE__); \
+		if (qglGetError) /* bones_was_here: is this pointer check still necessary? */ \
+			while ((gl_errornumber = qglGetError())) \
+				GL_PrintError(gl_errornumber, __FILE__, __LINE__); \
+	}}
+#else
+#define CHECKGLERROR
+#endif //DEBUGGL
+
+
 #endif //GLQUAKE_H