Browse Source

Fixed unnecessary inclusion of vertex shader parameters in pixel shader files.

Lasse Öörni 14 years ago
parent
commit
41abbf222d
1 changed files with 3 additions and 3 deletions
  1. 3 3
      Tools/ShaderCompiler/ShaderCompiler.cpp

+ 3 - 3
Tools/ShaderCompiler/ShaderCompiler.cpp

@@ -283,9 +283,6 @@ void Run(const Vector<String>& arguments)
     XMLElement shader = shaders.GetChildElement("shader");
     XMLElement shader = shaders.GetChildElement("shader");
     while (shader)
     while (shader)
     {
     {
-        constants_.Clear();
-        textureUnits_.Clear();
-        
         String source = shader.GetString("name");
         String source = shader.GetString("name");
         ShaderType compileType = Both;
         ShaderType compileType = Both;
         String type = shader.GetString("type");
         String type = shader.GetString("type");
@@ -372,6 +369,9 @@ void Run(const Vector<String>& arguments)
 
 
 void CompileVariations(const Shader& baseShader, XMLElement& shaders)
 void CompileVariations(const Shader& baseShader, XMLElement& shaders)
 {
 {
+    constants_.Clear();
+    textureUnits_.Clear();
+    
     unsigned combinations = 1;
     unsigned combinations = 1;
     PODVector<unsigned> usedCombinations;
     PODVector<unsigned> usedCombinations;
     Map<String, unsigned> nameToIndex;
     Map<String, unsigned> nameToIndex;