Define GL callback func. Improve GL err macro.

This commit is contained in:
Leith Bade
2014-12-02 01:21:40 +11:00
parent 8f60624bec
commit bbfe5d5ce4
2 changed files with 22 additions and 13 deletions

View File

@@ -1,4 +1,5 @@
#include <mbgl/platform/gl.hpp>
#include <mbgl/platform/log.hpp>
#include <iostream>
@@ -18,6 +19,10 @@ PFNGLGETOBJECTLABELPROC GetObjectLabel;
PFNGLOBJECTPTRLABELPROC ObjectPtrLabel;
PFNGLGETOBJECTPTRLABELPROC GetObjectPtrLabel;
void debug_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam) {
//mbgl::Error(mbgl::Event::OpenGL)
}
PFNGLBINDVERTEXARRAYPROC BindVertexArray = nullptr;
PFNGLDELETEVERTEXARRAYSPROC DeleteVertexArrays = nullptr;
PFNGLGENVERTEXARRAYSPROC GenVertexArrays = nullptr;
@@ -39,9 +44,10 @@ void _CHECK_GL_ERROR(const char *cmd, const char *file, int line) {
case GL_INVALID_VALUE: error = "INVALID_VALUE"; break;
case GL_OUT_OF_MEMORY: error = "OUT_OF_MEMORY"; break;
case GL_INVALID_FRAMEBUFFER_OPERATION: error = "INVALID_FRAMEBUFFER_OPERATION"; break;
default: error = "(unknown)"; break;
}
std::cerr << "GL_" << error.c_str() << " - " << file << ":" << line << std::endl;
mbgl::Log::Error(mbgl::Event::OpenGL, "GL_%s(0x%04X) - %s:%i", error.c_str(), file, line, err);
exit(1);
}
}