Clear the list of uniforms before recompiling.

Bug 18525426 Change-Id: I10c613b5c989467423f3bc84ed3c7039fa35abea Reviewed-on: https://swiftshader-review.googlesource.com/1504Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>

Clear the list of uniforms before recompiling.
3914bb4a · Nicolas Capens · Nicolas Capens · 22658244 · 3914bb4a · 3914bb4a
Commit 3914bb4a authored Dec 01, 2014 by Nicolas Capens Committed by Nicolas Capens Dec 02, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

Shader.cpp src/OpenGL/libGLESv2/Shader.cpp +4 -3

Shader.cpp src/Radiance/libRAD/Shader.cpp +4 -3

No files found.
--- a/src/OpenGL/libGLESv2/Shader.cpp
+++ b/src/OpenGL/libGLESv2/Shader.cpp
@@ -184,10 +184,11 @@ TranslatorASM *Shader::createCompiler(ShShaderType type)
 void Shader::clear()
 {
-    delete[] mInfoLog;
+	delete[] mInfoLog;
-    mInfoLog = NULL;
+	mInfoLog = NULL;
-    varyings.clear();
+	varyings.clear();
+	activeUniforms.clear();
 	activeAttributes.clear();
 }

--- a/src/Radiance/libRAD/Shader.cpp
+++ b/src/Radiance/libRAD/Shader.cpp
@@ -184,10 +184,11 @@ TranslatorASM *Shader::createCompiler(ShShaderType type)
 void Shader::clear()
 {
-    delete[] mInfoLog;
+	delete[] mInfoLog;
-    mInfoLog = NULL;
+	mInfoLog = NULL;
-    varyings.clear();
+	varyings.clear();
+	activeUniforms.clear();
 	activeAttributes.clear();
 }