X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=56ff34d2fd883eb93dcb3dee629c678814e86e0a;hb=d1da983b2ddfd221ef4348d2c40736264670c2b5;hp=afa6394e19018a4766cb3c05252f97d18700bbbc;hpb=455fbb0b9c7d7c4b66cc969ad0e9915fe95e420f;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index afa6394e..56ff34d2 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -583,7 +583,7 @@ void UnusedVariableRemover::merge_down_variables()
 		{
 			if(!i->second.referenced)
 				unused_nodes.insert(i->first);
-			clear_assignments(i->second, i->first->interface!="out");
+			clear_assignments(i->second, true);
 			continue;
 		}
 
@@ -639,12 +639,6 @@ void UnusedVariableRemover::visit(Iteration &iter)
 {
 	variables.push_back(BlockVariableMap());
 	TraversingVisitor::visit(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)
-			clear_assignments(i->second, false);
-
 	merge_down_variables();
 }