Menu
▾
▴
[Performous-commit] Lasse Karkkainen : RAII GLErrorChecker and better diagnostics.
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-27 22:00:20
|
Module: performous
Branch: opengl2
Commit: 416c5dc807eec6745dc7cd78bd908ff52a70d3a6
Author: Lasse Karkkainen <tro...@tr...>
Date: Thu Jan 27 22:59:56 2011 +0100
RAII GLErrorChecker and better diagnostics.
---
game/glshader.cc | 18 ++++++++----------
game/glutil.hh | 32 +++++++++++++++++++-------------
game/guitargraph.cc | 3 +--
game/main.cc | 4 ++--
game/surface.cc | 10 ++++------
game/video_driver.cc | 5 ++---
6 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/game/glshader.cc b/game/glshader.cc
index 083fca5..0fa3c2b 100644
--- a/game/glshader.cc
+++ b/game/glshader.cc
@@ -70,12 +70,11 @@ void Shader::loadFromFile(const std::string& vert_path, const std::string& frag_
void Shader::compile(const char* source, GLenum type) {
- glutil::GLErrorChecker::reset();
+ glutil::GLErrorChecker ec("Shader::compile");
GLenum new_shader = glCreateShader(type);
- glutil::GLErrorChecker shadererror("Shader::compile - glCreateShader");
-
+ ec.check("glCreateShader");
glShaderSource(new_shader, 1, &source, NULL);
- glutil::GLErrorChecker shadersourceerror("Shader::compile - glShaderSource");
+ ec.check("glShaderSource");
glCompileShader(new_shader);
glGetShaderiv(new_shader, GL_COMPILE_STATUS, &gl_response);
@@ -89,16 +88,15 @@ void Shader::compile(const char* source, GLenum type) {
void Shader::link() {
- glutil::GLErrorChecker::reset();
+ glutil::GLErrorChecker ec("Shader::link");
if (program) throw std::runtime_error("Shader already linked.");
// Create the program id
program = glCreateProgram();
- glutil::GLErrorChecker createprogramerror("Shader::link - glCreateProgram");
-
+ ec.check("glCreateProgram");
// Attach all compiled shaders to it
for (ShaderObjects::const_iterator it = shader_ids.begin(); it != shader_ids.end(); ++it)
glAttachShader(program, *it);
- glutil::GLErrorChecker attachshadererror("Shader::link - glAttachShader");
+ ec.check("glAttachShader");
// Link and check status
glLinkProgram(program);
@@ -107,15 +105,15 @@ void Shader::link() {
dumpInfoLog(program);
throw std::runtime_error("Something went wrong linking the shader program.");
}
- glutil::GLErrorChecker linkerror("Shader::link - glLinkProgram");
+ ec.check("glLinkProgram");
shader_progs[program] = this;
}
void Shader::bind() {
+ glutil::GLErrorChecker ec("Shader::bind");
glUseProgram(program);
- glutil::GLErrorChecker glerror("Shader::bind");
}
diff --git a/game/glutil.hh b/game/glutil.hh
index 781b757..d07c25e 100644
--- a/game/glutil.hh
+++ b/game/glutil.hh
@@ -189,21 +189,27 @@ namespace glutil {
/// Checks for OpenGL error and displays it with given location info
struct GLErrorChecker {
- GLErrorChecker(std::string info = "") {
- GLenum err;
- if ((err = glGetError()) != GL_NO_ERROR) {
- if (!info.empty()) info = " (" + info +")";
- switch(err) {
- case GL_INVALID_ENUM: std::cerr << "OpenGL error: invalid enum" << info << std::endl; break;
- case GL_INVALID_VALUE: std::cerr << "OpenGL error: invalid value" << info << std::endl; break;
- case GL_INVALID_OPERATION: std::cerr << "OpenGL error: invalid operation" << info << std::endl; break;
- case GL_STACK_OVERFLOW: std::cerr << "OpenGL error: stack overflow" << info << std::endl; break;
- case GL_STACK_UNDERFLOW: std::cerr << "OpenGL error: stack underflow" << info << std::endl; break;
- case GL_OUT_OF_MEMORY: std::cerr << "OpenGL error: out of memory" << info << std::endl; break;
- }
- }
+ std::string info;
+ GLErrorChecker(std::string const& info): info(info) { check("precondition"); }
+ ~GLErrorChecker() { check("postcondition"); }
+ void check(std::string const& what = "check()") {
+ GLenum err = glGetError();
+ if (err == GL_NO_ERROR) return;
+ std::clog << "opengl/error: " << msg(err) << " in " << info << " " << what << std::endl;
}
static void reset() { glGetError(); }
+ static std::string msg(GLenum err) {
+ switch(err) {
+ case GL_NO_ERROR: return std::string();
+ case GL_INVALID_ENUM: return "Invalid enum";
+ case GL_INVALID_VALUE: return "Invalid value";
+ case GL_INVALID_OPERATION: return "Invalid operation";
+ case GL_STACK_OVERFLOW: return "Stack overflow";
+ case GL_STACK_UNDERFLOW: return "Stack underflow";
+ case GL_OUT_OF_MEMORY: return "Out of memory";
+ default: return "Unknown error";
+ }
+ }
};
}
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 66024c8..f241a4d 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -788,6 +788,7 @@ namespace {
/// Main drawing function (projection, neck, cursor...)
void GuitarGraph::draw(double time) {
+ // FIXME: There are errors here... glutil::GLErrorChecker ec("GuitarGraph::draw");
Dimensions dimensions(1.0); // FIXME: bogus aspect ratio (is this fixable?)
dimensions.screenBottom().middle(m_cx.get()).fixedWidth(std::min(m_width.get(),0.5));
double offsetX = 0.5 * (dimensions.x1() + dimensions.x2());
@@ -941,8 +942,6 @@ void GuitarGraph::draw(double time) {
}
}
}
- glutil::GLErrorChecker::reset(); // FIXME: There are errors here.
- //glutil::GLErrorChecker glerror("GuitarGraph::draw - objects");
} //< disable depth test
// Draw flames
for (int fret = 0; fret < m_pads; ++fret) { // Loop through the frets
diff --git a/game/main.cc b/game/main.cc
index 45d94ed..a7d7987 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -105,8 +105,6 @@ static void checkEvents_SDL(ScreenManager& sm) {
// This is needed to allow navigation (quiting the song) to function even then
input::SDL::pushEvent(event);
sm.getCurrentScreen()->manageEvent(event);
- // Check for OpenGL errors
- glutil::GLErrorChecker glerror;
}
if (config["graphic/fullscreen"].b() != sm.window().getFullscreen()) {
sm.window().setFullscreen(config["graphic/fullscreen"].b());
@@ -162,6 +160,7 @@ void mainLoop(std::string const& songlist) {
// Main loop
boost::xtime time = now();
unsigned frames = 0;
+ glutil::GLErrorChecker glerror("mainloop");
while (!sm.isFinished()) {
Profiler prof("mainloop");
if( g_take_screenshot ) {
@@ -206,6 +205,7 @@ void mainLoop(std::string const& songlist) {
std::cerr << "ERROR: " << e.what() << std::endl;
sm.flashMessage(std::string("ERROR: ") + e.what());
}
+ glerror.check("frame");
}
} catch (std::exception& e) {
// This should use ScreenManager fatalError, but it cannot
diff --git a/game/surface.cc b/game/surface.cc
index d95e0e9..ec2004e 100644
--- a/game/surface.cc
+++ b/game/surface.cc
@@ -77,6 +77,7 @@ namespace {
}
void Texture::load(unsigned int width, unsigned int height, pix::Format format, unsigned char const* buffer, float ar) {
+ glutil::GLErrorChecker glerror("Texture::load");
m_ar = ar ? ar : double(width) / height;
UseTexture texture(*this);
// When texture area is small, bilinear filter the closest mipmap
@@ -87,12 +88,12 @@ void Texture::load(unsigned int width, unsigned int height, pix::Format format,
glTexParameterf(type(), GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameterf(type(), GL_TEXTURE_WRAP_T, GL_REPEAT);
//glTexParameterf(type(), GL_TEXTURE_MAX_LEVEL, 1);
- glutil::GLErrorChecker glerror1("Texture::load - glTexParameterf");
+ glerror.check("glTexParameterf");
// Anisotropy is potential trouble maker
if (GLEW_EXT_texture_filter_anisotropic)
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 16.0f);
- glutil::GLErrorChecker glerror2("Texture::load - MAX_ANISOTROPY_EXT");
+ glerror.check("MAX_ANISOTROPY_EXT");
glTexParameteri(type(), GL_GENERATE_MIPMAP, GL_TRUE);
PixFmt const& f = getPixFmt(format);
@@ -112,11 +113,10 @@ void Texture::load(unsigned int width, unsigned int height, pix::Format format,
// Just don't do it in Surface class, thanks. -Tronic
glTexImage2D(type(), 0, GL_RGBA, newWidth, newHeight, 0, f.format, f.type, &outBuf[0]);
}
- // Check for OpenGL errors
- glutil::GLErrorChecker glerror3("Texture::load");
}
void Surface::load(unsigned int width, unsigned int height, pix::Format format, unsigned char const* buffer, float ar) {
+ glutil::GLErrorChecker glerror("Surface::load");
using namespace pix;
// Initialize dimensions
m_width = width; m_height = height;
@@ -126,8 +126,6 @@ void Surface::load(unsigned int width, unsigned int height, pix::Format format,
PixFmt const& f = getPixFmt(format);
glPixelStorei(GL_UNPACK_SWAP_BYTES, f.swap);
glTexImage2D(m_texture.type(), 0, GL_RGBA, width, height, 0, f.format, f.type, buffer);
- // Check for OpenGL errors
- glutil::GLErrorChecker glerror("Surface::load");
}
void Surface::draw() const {
diff --git a/game/video_driver.cc b/game/video_driver.cc
index ecd05d4..5dae9f0 100644
--- a/game/video_driver.cc
+++ b/game/video_driver.cc
@@ -152,6 +152,7 @@ void Window::screenshot() {
void Window::resize() {
+ glutil::GLErrorChecker glerror("Window::resize");
unsigned width = m_fullscreen ? m_fsW : m_windowW;
unsigned height = m_fullscreen ? m_fsH : m_windowH;
{ // Setup GL attributes for context creation
@@ -170,7 +171,7 @@ void Window::resize() {
screen = SDL_SetVideoMode(width, height, 0, SDL_OPENGL | SDL_RESIZABLE | (m_fullscreen ? SDL_FULLSCREEN : 0));
if (!screen) throw std::runtime_error(std::string("SDL_SetVideoMode failed: ") + SDL_GetError());
}
-
+ glerror.check("SetVideoMode");
s_width = screen->w;
s_height = screen->h;
if (!m_fullscreen) {
@@ -187,8 +188,6 @@ void Window::resize() {
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
glShadeModel(GL_SMOOTH);
glEnable(GL_BLEND);
- // Check for OpenGL errors
- glutil::GLErrorChecker glerror("Window::resize");
}
FarTransform::FarTransform() {
|
