From 93d56294cf6f7af39679a871f51087be34f813a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Wed, 10 Dec 2014 13:21:08 +0100 Subject: update error reporting function --- src/mbgl/platform/gl.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/mbgl/platform') 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); } } + +} +} -- cgit v1.2.1