haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved error handling for SHADER class.

This commit is contained in:
Maciej Suminski 2016-05-23 09:54:53 +02:00
parent 3ca7026aa0
commit 2ded7bf82a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/gal/opengl/shader.cpp
View File

@ -127,8 +127,10 @@ int SHADER::AddParameter( const std::string& aParameterName )
{ {
GLint location = glGetUniformLocation( programNumber, aParameterName.c_str() ); GLint location = glGetUniformLocation( programNumber, aParameterName.c_str() );
if( location != -1 ) if( location >= 0 )
parameterLocation.push_back( location ); parameterLocation.push_back( location );
else
throw std::runtime_error( "Could not find shader uniform: " + aParameterName );
return parameterLocation.size() - 1; return parameterLocation.size() - 1;
} }
@ -136,12 +138,16 @@ int SHADER::AddParameter( const std::string& aParameterName )
void SHADER::SetParameter( int parameterNumber, float value ) const void SHADER::SetParameter( int parameterNumber, float value ) const
{ {
assert( (unsigned) parameterNumber < parameterLocation.size() );
glUniform1f( parameterLocation[parameterNumber], value ); glUniform1f( parameterLocation[parameterNumber], value );
} }
void SHADER::SetParameter( int parameterNumber, int value ) const void SHADER::SetParameter( int parameterNumber, int value ) const
{ {
assert( (unsigned) parameterNumber < parameterLocation.size() );
glUniform1i( parameterLocation[parameterNumber], value ); glUniform1i( parameterLocation[parameterNumber], value );
} }