Mostly cosmetic tweaks

[libs/gl.git] / source / glsl / optimize.cpp

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 1ebb87c5c2ea23360c33917104745273de6d8da0..3f63dd8a7debaac0c492c0f3f5a2e9491d989ebf 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -14,7 +14,7 @@ InlineableFunctionLocator::InlineableFunctionLocator():
 void InlineableFunctionLocator::visit(FunctionCall &call)
 {
        FunctionDeclaration *def = call.declaration;
-       if(def && def->definition!=def)
+       if(def)
                def = def->definition;
 
        if(def)
@@ -95,7 +95,7 @@ void FunctionInliner::visit(FunctionCall &call)
                visit_and_inline(*i);
 
        FunctionDeclaration *def = call.declaration;
-       if(def && def->definition!=def)
+       if(def)
                def = def->definition;
 
        if(def && inlineable.count(def))
@@ -259,7 +259,7 @@ void UnusedVariableRemover::visit(VariableReference &var)
        if(var.declaration && !assignment_target)
        {
                VariableInfo &var_info = variables.back()[var.declaration];
-               var_info.assignments.clear();
+               clear_assignments(var_info, false);
                var_info.referenced = true;
        }
 }
@@ -441,7 +441,7 @@ void UnusedVariableRemover::visit(Iteration &iter)
        BlockVariableMap &block_variables = variables.back();
        for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i)
                if(!i->second.local && i->second.referenced)
-                       i->second.assignments.clear();
+                       clear_assignments(i->second, false);
 
        merge_down_variables();
 }