X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.h;fp=util.h;h=45fe6ba922b9728c5ac827ddb4b4d63a13a8ad11;hp=f5b5dd368f4665c25d2e3c438714c2696cf90234;hb=4f8b89618d6d09b4df811c4e2d7dcfa20815dcb3;hpb=bb578b403deef87c90b330f860ad35d80433b702 diff --git a/util.h b/util.h index f5b5dd3..45fe6ba 100644 --- a/util.h +++ b/util.h @@ -8,6 +8,7 @@ #include #include #include +#include "defs.h" #define BUFFER_OFFSET(i) ((char *)NULL + (i)) @@ -93,12 +94,15 @@ unsigned next_power_of_two(unsigned v); // back into anything you intend to pass into OpenGL. void *get_gl_context_identifier(); +// Used in the check_error() macro, below. +void abort_gl_error(GLenum err, const char *filename, int line) DOES_NOT_RETURN; + } // namespace movit #ifdef NDEBUG #define check_error() #else -#define check_error() { int err = glGetError(); if (err != GL_NO_ERROR) { printf("GL error 0x%x at %s:%d\n", err, __FILE__, __LINE__); abort(); } } +#define check_error() { GLenum err = glGetError(); if (err != GL_NO_ERROR) { movit::abort_gl_error(err, __FILE__, __LINE__); } } #endif // CHECK() is like assert(), but retains any side effects no matter the compilation mode.