[Scummvm-cvs-logs] scummvm master -> 0f36a56b813c4270033804de8dd4f3412bedca55

lordhoto lordhoto at gmail.com
Tue Jan 21 23:53:24 CET 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0f36a56b81 OPENGL: Properly query for OpenGL errors.


Commit: 0f36a56b813c4270033804de8dd4f3412bedca55
    https://github.com/scummvm/scummvm/commit/0f36a56b813c4270033804de8dd4f3412bedca55
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-21T14:52:20-08:00

Commit Message:
OPENGL: Properly query for OpenGL errors.

There might be various error flags and we need to clear all of them to get
precise error results. Thus, we need to call glGetError in a loop to achieve
that.

Changed paths:
    backends/graphics/opengl/debug.cpp



diff --git a/backends/graphics/opengl/debug.cpp b/backends/graphics/opengl/debug.cpp
index 69006bb..d5d73fb 100644
--- a/backends/graphics/opengl/debug.cpp
+++ b/backends/graphics/opengl/debug.cpp
@@ -52,9 +52,9 @@ Common::String getGLErrStr(GLenum error) {
 } // End of anonymous namespace
 
 void checkGLError(const char *expr, const char *file, int line) {
-	GLenum error = glGetError();
+	GLenum error;
 
-	if (error != GL_NO_ERROR) {
+	while ((error = glGetError()) != GL_NO_ERROR) {
 		// We cannot use error here because we do not know whether we have a
 		// working screen or not.
 		warning("GL ERROR: %s on %s (%s:%d)", getGLErrStr(error).c_str(), expr, file, line);






More information about the Scummvm-git-logs mailing list