thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OPENGL: Do not keep uniform state for nonexistent uniforms.

Browse source
This commit is contained in:
Johannes Schickel 2016-03-04 16:08:28 +01:00
parent 1e1272a8c4
commit 17b1124a5a
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backends/graphics/opengl/shader.cpp
View file

@ -231,8 +231,14 @@ bool Shader::setUniform(const Common::String &name, ShaderUniformValue *value) {
Uniform *uniform;
if (uniformIter == _uniforms.end()) {
const GLint location = getUniformLocation(name.c_str());
if (location == -1) {
delete value;
return false;
}
uniform = &_uniforms[name];
uniform->location = getUniformLocation(name.c_str());
uniform->location = location;
} else {
uniform = &uniformIter->_value;
}
@ -242,7 +248,8 @@ bool Shader::setUniform(const Common::String &name, ShaderUniformValue *value) {
if (_isActive) {
uniform->set();
}
return uniform->location != -1;
return true;
}
GLshader Shader::compileShader(const char *source, GLenum shaderType) {