|
From: <axl...@us...> - 2009-06-14 13:05:37
|
Revision: 322
http://hgengine.svn.sourceforge.net/hgengine/?rev=322&view=rev
Author: axlecrusher
Date: 2009-06-14 13:05:36 +0000 (Sun, 14 Jun 2009)
Log Message:
-----------
error checks
Modified Paths:
--------------
Mercury2/src/Shader.cpp
Modified: Mercury2/src/Shader.cpp
===================================================================
--- Mercury2/src/Shader.cpp 2009-06-14 12:12:29 UTC (rev 321)
+++ Mercury2/src/Shader.cpp 2009-06-14 13:05:36 UTC (rev 322)
@@ -403,6 +403,7 @@
void Shader::ActivateShader()
{
glUseProgramObjectARB( iProgramID );
+ GLERRORCHECK;
for( unsigned i = 0; i < m_vShaderTabs.size(); ++i )
{
@@ -412,10 +413,13 @@
case ShaderAttribute::TYPE_INT:
case ShaderAttribute::TYPE_SAMPLER:
glUniform1iARB( i, sa->sau.iInt );
+ GLERRORCHECK;
break;
case ShaderAttribute::TYPE_FLOAT:
case ShaderAttribute::TYPE_FLOATV4:
glUniform4fvARB( i, 4, &sa->sau.fFloatV4[0] );
+ GLERRORCHECK;
+ break;
};
}
}
@@ -423,6 +427,7 @@
void Shader::DeactivateShader()
{
glUseProgramObjectARB( 0 );
+ GLERRORCHECK;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|