From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Mon, 15 Aug 2011 11:26:07 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~157
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1e4e8bee92c6e2c747910fb38adfc60fff01b465;p=casparcg

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

diff --git a/common/gl/gl_check.h b/common/gl/gl_check.h
index 4750309b7..926ac9939 100644
--- 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
 
 #define GL(expr) \
-	[&] \
+	if(false){}else \
 	{ \
 		(expr);  \
 		caspar::gl::SMFL_GLCheckError(CASPAR_GL_EXPR_STR(expr), __FILE__, __LINE__);\
-	}()
+	}
 
 #define GL2(expr) \
 	[&]() -> decltype(expr)\
diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index 9d6a4221b..2d8aad35b 100644
--- 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)
 {	
 	if(attached_texture_ != texture.id())
 	{
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + 0, GL_TEXTURE_2D, texture.id(), 0);
+		GL(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + 0, GL_TEXTURE_2D, texture.id(), 0));
 		attached_texture_ = texture.id();
 	}
 }
@@ -281,14 +281,14 @@ void ogl_device::attach(device_buffer& texture)
 void ogl_device::clear(device_buffer& texture)
 {	
 	attach(texture);
-	glClear(GL_COLOR_BUFFER_BIT);
+	GL(glClear(GL_COLOR_BUFFER_BIT));
 }
 
 void ogl_device::use(shader& shader)
 {
 	if(active_shader_ != shader.id())
 	{		
-		glUseProgramObjectARB(shader.id());	
+		GL(glUseProgramObjectARB(shader.id()));	
 		active_shader_ = shader.id();
 	}
 }