projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverted bigger parts of tuxdev patch:
[supertux.git]
/
src
/
video
/
glutil.hpp
diff --git
a/src/video/glutil.hpp
b/src/video/glutil.hpp
index
be09ba4
..
6c2122f
100644
(file)
--- a/
src/video/glutil.hpp
+++ b/
src/video/glutil.hpp
@@
-1,7
+1,7
@@
// $Id$
//
// $Id$
//
-// SuperTux
- A Jump'n Run
-// Copyright (C) 200
4 Matthias Braun <matze@braunis.de
+// SuperTux
+// Copyright (C) 200
6 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-23,7
+23,7
@@
#include <stdexcept>
#include <GL/gl.h>
#include <stdexcept>
#include <GL/gl.h>
-static inline void
assert_gl
(const char* message)
+static inline void
check_gl_error
(const char* message)
{
#ifdef DEBUG
GLenum error = glGetError();
{
#ifdef DEBUG
GLenum error = glGetError();
@@
-52,14
+52,27
@@
static inline void assert_gl(const char* message)
msg << "OUT_OF_MEMORY: There is not enough memory left to execute the "
"command.";
break;
msg << "OUT_OF_MEMORY: There is not enough memory left to execute the "
"command.";
break;
+#ifdef GL_TABLE_TOO_LARGE
+ case GL_TABLE_TOO_LARGE:
+ msg << "TABLE_TOO_LARGE: table is too large";
+ break;
+#endif
default:
msg << "Unknown error (code " << error << ")";
}
default:
msg << "Unknown error (code " << error << ")";
}
-
+
throw std::runtime_error(msg.str());
}
#endif
}
throw std::runtime_error(msg.str());
}
#endif
}
+static inline void assert_gl(const char* message)
+{
+#ifdef DEBUG
+ check_gl_error(message);
+#else
+ (void) message;
#endif
#endif
+}
+#endif