only report STACK_OVERFLOW/STACK_UNDERFLOW when the GL implementation has them

This commit is contained in:
Konstantin Käfer
2014-12-10 13:46:26 +01:00
parent 93d56294cf
commit 4ad28c931a
2 changed files with 14 additions and 4 deletions

View File

@@ -2,6 +2,7 @@
#define MBGL_RENDERER_GL
#include <string>
#include <stdexcept>
#if __APPLE__
#include "TargetConditionals.h"
@@ -29,6 +30,12 @@
namespace mbgl {
namespace gl {
struct Error : ::std::runtime_error {
inline Error(GLenum err, const std::string &msg) : ::std::runtime_error(msg), code(err) {};
const GLenum code;
};
// GL_KHR_debug / GL_ARB_debug_output
#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242
#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243

View File

@@ -75,8 +75,8 @@ PFNGLPROGRAMBINARYPROC ProgramBinary = nullptr;
PFNGLPROGRAMPARAMETERIPROC ProgramParameteri = nullptr;
void checkError(const char *cmd, const char *file, int line) {
GLenum err;
while ((err = glGetError()) != GL_NO_ERROR) {
const GLenum err = glGetError();
if (err != GL_NO_ERROR) {
const char *error = nullptr;
switch (err) {
case GL_INVALID_ENUM: error = "INVALID_ENUM"; break;
@@ -84,13 +84,16 @@ void checkError(const char *cmd, const char *file, int line) {
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;
#ifdef GL_STACK_UNDERFLOW
case GL_STACK_UNDERFLOW: error = "STACK_UNDERFLOW"; break;
#endif
#ifdef GL_STACK_OVERFLOW
case GL_STACK_OVERFLOW: error = "STACK_OVERFLOW"; break;
#endif
default: error = "(unknown)"; break;
}
mbgl::Log::Error(mbgl::Event::OpenGL, "%s: Error GL_%s (0x%04X) - %s:%i", cmd, error, err, file, line);
exit(1);
throw ::mbgl::gl::Error(err, std::string(cmd) + ": Error GL_" + error + " - " + file + ":" + std::to_string(line));
}
}