git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/common/gl/gl_check.h b/common/gl/gl_check.h
index 4750309b76343cbb15e263bb1b29032785dc66b9..926ac993956bb35516f029d305c6130882024e9d 100644 (file)
--- a/common/gl/gl_check.h
+++ b/common/gl/gl_check.h
@@ -44,11 +44,11 @@ void SMFL_GLCheckError(const std::string& expr, const std::string& File, unsigne
 #define CASPAR_GL_EXPR_STR(expr) #expr\r
 \r
 #define GL(expr) \\r
-       [&] \\r
+       if(false){}else \\r
        { \\r
                (expr);  \\r
                caspar::gl::SMFL_GLCheckError(CASPAR_GL_EXPR_STR(expr), __FILE__, __LINE__);\\r
-       }()\r
+       }\r
 \r
 #define GL2(expr) \\r
        [&]() -> decltype(expr)\\r

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index 9d6a4221b456c904a6a295b28b3b9de8d0a62d4f..2d8aad35b44f625e4cf967af63944bc33a5d5e46 100644 (file)
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -273,7 +273,7 @@ void ogl_device::attach(device_buffer& texture)
 {      \r
        if(attached_texture_ != texture.id())\r
        {\r
-               glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + 0, GL_TEXTURE_2D, texture.id(), 0);\r
+               GL(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + 0, GL_TEXTURE_2D, texture.id(), 0));\r
                attached_texture_ = texture.id();\r
        }\r
 }\r
@@ -281,14 +281,14 @@ void ogl_device::attach(device_buffer& texture)
 void ogl_device::clear(device_buffer& texture)\r
 {      \r
        attach(texture);\r
-       glClear(GL_COLOR_BUFFER_BIT);\r
+       GL(glClear(GL_COLOR_BUFFER_BIT));\r
 }\r
 \r
 void ogl_device::use(shader& shader)\r
 {\r
        if(active_shader_ != shader.id())\r
        {               \r
-               glUseProgramObjectARB(shader.id());     \r
+               GL(glUseProgramObjectARB(shader.id())); \r
                active_shader_ = shader.id();\r
        }\r
 }\r