2.0.0.2: gl: Always enable OpenGL error checking.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@849 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/gl/gl_check.cpp b/common/gl/gl_check.cpp
index f82f7403a8ddda404207cf087ef26539c8e1425e..caa0ef48211ba15c3df2281dcf2183d7ad645f66 100644 (file)
--- a/common/gl/gl_check.cpp
+++ b/common/gl/gl_check.cpp
@@ -88,18 +88,4 @@ void SMFL_GLCheckError(const std::string& expr, const std::string& File, unsigne
        }\r
 }\r
 \r
-#ifdef _DEBUG\r
-       \r
-#define CASPAR_GL_EXPR_STR(expr) #expr\r
-\r
-#define GL(expr) \\r
-       do \\r
-       { \\r
-               (expr);  \\r
-               caspar::gl::SMFL_GLCheckError(CASPAR_GL_EXPR_STR(expr), __FILE__, __LINE__);\\r
-       }while(0);\r
-#else\r
-#define GL(expr) expr\r
-#endif\r
-\r
 }}
\ No newline at end of file

diff --git a/common/gl/gl_check.h b/common/gl/gl_check.h
index 49db7384d38e397d60befd895711daa0a57137c3..177ecbd65619aa7d2d06a55accbd06c0245a8ed6 100644 (file)
--- a/common/gl/gl_check.h
+++ b/common/gl/gl_check.h
@@ -39,7 +39,7 @@ struct ogl_invalid_framebuffer_operation_ext  : virtual ogl_exception{};
 \r
 void SMFL_GLCheckError(const std::string& expr, const std::string& File, unsigned int Line);\r
 \r
-#ifdef _DEBUG\r
+//#ifdef _DEBUG\r
        \r
 #define CASPAR_GL_EXPR_STR(expr) #expr\r
 \r
@@ -49,8 +49,8 @@ void SMFL_GLCheckError(const std::string& expr, const std::string& File, unsigne
                (expr);  \\r
                caspar::gl::SMFL_GLCheckError(CASPAR_GL_EXPR_STR(expr), __FILE__, __LINE__);\\r
        }while(0);\r
-#else\r
-#define GL(expr) expr\r
-#endif\r
+//#else\r
+//#define GL(expr) expr\r
+//#endif\r
 \r
 }}
\ No newline at end of file