From 17b1124a5aa294d39cf3a3c6fc6561f835affe2d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 4 Mar 2016 16:08:28 +0100
Subject: OPENGL: Do not keep uniform state for nonexistent uniforms.

---
 backends/graphics/opengl/shader.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'backends/graphics')

diff --git a/backends/graphics/opengl/shader.cpp b/backends/graphics/opengl/shader.cpp
index 652da57dfa..27981f25dc 100644
--- a/backends/graphics/opengl/shader.cpp
+++ b/backends/graphics/opengl/shader.cpp
@@ -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) {
-- 
cgit v1.2.3