make checkGlError generally available

[gltest.git] / glutil_gl2.cpp

diff --git a/glutil_gl2.cpp b/glutil_gl2.cpp
index 666ede9b5fd074c2dfe089c86b9a7321c3b438bb..68a789b661ce65d8af5cc410482729c1700938d0 100644 (file)
--- a/glutil_gl2.cpp
+++ b/glutil_gl2.cpp
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include "glutil.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
 #include <sstream>
 
-#include "glutil.h"
-
 // extension functions we use
 typedef GLuint (*GLCREATESHADERPROC) (GLenum type);
 typedef void (*GLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
@@ -127,32 +127,6 @@ void resolveFunctionPointers(T_glGetProcAddress p_glGetProcAddress)
        p_glDeleteBuffers = (GLDELETEBUFFERSPROC)resolveFunctionPointer(p_glGetProcAddress, "glDeleteBuffers");
 }
 
-static const char *glErrorToString(GLenum e)
-{
-#define CASE(name) case name: return #name
-       switch (e) {
-               CASE(GL_NO_ERROR);
-               CASE(GL_INVALID_ENUM);
-               CASE(GL_INVALID_VALUE);
-               CASE(GL_INVALID_OPERATION);
-#ifndef CON_GLES2
-               CASE(GL_STACK_OVERFLOW);
-               CASE(GL_STACK_UNDERFLOW);
-#endif
-               CASE(GL_OUT_OF_MEMORY);
-               default: return "<unknown>";
-       }
-#undef CASE
-}
-
-static void checkGlError(const char *what)
-{
-       GLenum e = glGetError();
-       if (e == GL_NO_ERROR) return;
-       fprintf(stderr, "GL error %d (%s): %s\n", e, glErrorToString(e), what);
-       exit(1);
-}
-
 // shaders
 static const char *vertex_shader_source =
 "#version 100 \n\