X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=3f63dd8a7debaac0c492c0f3f5a2e9491d989ebf;hb=7f29c6d2a4eee36538d7ccf24980e749592e2444;hp=1ebb87c5c2ea23360c33917104745273de6d8da0;hpb=b006be7a2eccaeff9647b5b403d7d0a4ff13da3b;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 1ebb87c5..3f63dd8a 100644
--- 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();
 }