Ticket #4344: 4344_opengl.patch

source/lib/ogl.cpp

@@ -373 +373 @@
 
 //----------------------------------------------------------------------------
 
-static void dump_gl_error(GLenum err)
+const char* ogl_GetErrorName(GLenum err)
 {
-    debug_printf("OGL| ");
-#define E(e) case e: debug_printf("%s\n", #e); break;
+#define E(e) case e: return #e;
     switch (err)
     {
     E(GL_INVALID_ENUM)
@@ -388 +387 @@
 #endif
     E(GL_OUT_OF_MEMORY)
     E(GL_INVALID_FRAMEBUFFER_OPERATION)
-    default: debug_printf("Unknown GL error: %04x\n", err); break;
+    default: return "Unknown GL error";
     }
 #undef E
 }
 
+static void dump_gl_error(GLenum err)
+{
+    debug_printf("OGL| %s (%04x)\n", ogl_GetErrorName(err), err);
+}
+
 void ogl_WarnIfErrorLoc(const char *file, int line)
 {
     // glGetError may return multiple errors, so we poll it in a loop.

source/lib/ogl.h

@@ -160 +160 @@
 #endif
 
 /**
+* get a name of the error.
+*
+* useful for debug.
+*
+* @return read-only C string of unspecified length containing
+* the error's name.
+**/
+extern const char* ogl_GetErrorName(GLenum err);
+
+/**
  * ignore and reset the specified OpenGL error.
  *
  * this is useful for suppressing annoying error messages, e.g.

source/renderer/Renderer.cpp

@@ -1624 +1624 @@
         int err = glGetError();
         if (err)
         {
-            ONCE(LOGERROR("CRenderer::EndFrame: GL errors %i occurred", err));
+            ONCE(LOGERROR("CRenderer::EndFrame: GL errors %s (0x%04x) occurred", ogl_GetErrorName(err), err));
         }
     }
 }