mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-16 21:33:59 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix for users toggling back from Linux tty session

Browse Source
This commit is contained in:
Mark Vejvoda
2011-04-18 19:48:05 +00:00
parent 016771ed81
commit c4d32ae0d2
2 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/shared_lib/include/graphics/gl/opengl.h
View File

@@ -48,23 +48,24 @@ int getGlModelviewMatrixStackDepth();
int getGlProjectionMatrixStackDepth();
void checkGlExtension(const char *extensionName);
void inline _assertGl(const char *file, int line){
GLenum error= glGetError();
if(error != GL_NO_ERROR){
void inline _assertGl(const char *file, int line, GLenum *forceErrorNumber = NULL) {
GLenum error = (forceErrorNumber != NULL ? *forceErrorNumber : glGetError());
if(error != GL_NO_ERROR) {
const char *errorString= reinterpret_cast<const char*>(gluErrorString(error));
throw runtime_error("OpenGL error: "+string(errorString)+" at file: "+string(file)+", line "+intToStr(line));
throw runtime_error("OpenGL error #" + intToStr(error) + " : " + string(errorString) + " at file: " + string(file) + ", line " + intToStr(line));
}
}
#ifdef NDEBUG
#define assertGl() ((void) 0);
#define assertGlWithErrorNumber(forceErrorNumber) ((void) 0);
#else
#define assertGl() _assertGl(__FILE__, __LINE__);
#define assertGlWithErrorNumber(forceErrorNumber) _assertGl(__FILE__, __LINE__, &forceErrorNumber);
#endif