update error reporting function

1 files changed, 10 insertions, 11 deletions

diff --git a/src/mbgl/platform/gl.cpp b/src/mbgl/platform/gl.cpp
index d56d395598..e766ac3310 100644
--- a/src/mbgl/platform/gl.cpp
+++ b/src/mbgl/platform/gl.cpp
@@ -74,26 +74,25 @@ PFNGLGETPROGRAMBINARYPROC GetProgramBinary = nullptr;
 PFNGLPROGRAMBINARYPROC ProgramBinary = nullptr;
 PFNGLPROGRAMPARAMETERIPROC ProgramParameteri = nullptr;
 
-}
-}
-
-void _CHECK_GL_ERROR(const char */*cmd*/, const char *file, int line) {
-    //std::cout <<  cmd << ";" << std::endl;
-
+void checkError(const char *cmd, const char *file, int line) {
     GLenum err;
-
     while ((err = glGetError()) != GL_NO_ERROR) {
-        std::string error;
+        const char *error = nullptr;
         switch (err) {
-            case GL_INVALID_OPERATION: error = "INVALID_OPERATION"; break;
             case GL_INVALID_ENUM: error = "INVALID_ENUM"; break;
             case GL_INVALID_VALUE: error = "INVALID_VALUE"; break;
-            case GL_OUT_OF_MEMORY: error = "OUT_OF_MEMORY"; break;
+            case GL_INVALID_OPERATION: error = "INVALID_OPERATION"; break;
             case GL_INVALID_FRAMEBUFFER_OPERATION:  error = "INVALID_FRAMEBUFFER_OPERATION";  break;
+            case GL_OUT_OF_MEMORY: error = "OUT_OF_MEMORY"; break;
+            case GL_STACK_UNDERFLOW:  error = "STACK_UNDERFLOW";  break;
+            case GL_STACK_OVERFLOW:  error = "STACK_OVERFLOW";  break;
             default: error = "(unknown)"; break;
         }
 
-        mbgl::Log::Error(mbgl::Event::OpenGL, "GL_%s (0x%04X) - %s:%i", error.c_str(), file, line, err);
+        mbgl::Log::Error(mbgl::Event::OpenGL, "%s: Error GL_%s (0x%04X) - %s:%i", cmd, error, err, file, line);
         exit(1);
     }
 }
+
+}
+}