X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=8008465e91344642f76e4fb66ae4a135e8bce66f;hb=241cf36a6d7735706804bb3c517529bbe078f1ee;hp=1e974c9f01f8eee6d3eea5faabc00b20759ffd37;hpb=209fc09bcf2947ca60ddf15b8903d0c3194c7d5d;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 1e974c9f..8008465e 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -1324,7 +1324,7 @@ void UnusedVariableRemover::visit(VariableReference &var)
 {
 	if(composite_reference)
 		r_reference.declaration = var.declaration;
-	else
+	else if(var.declaration)
 		referenced(var.declaration, var);
 }
 
@@ -1332,7 +1332,7 @@ void UnusedVariableRemover::visit(InterfaceBlockReference &iface)
 {
 	if(composite_reference)
 		r_reference.declaration = iface.declaration;
-	else
+	else if(iface.declaration)
 		referenced(iface.declaration, iface);
 }
 
@@ -1384,6 +1384,7 @@ void UnusedVariableRemover::visit(BinaryExpression &binary)
 		{
 			SetFlag clear_assignment(assignment_target, false);
 			SetFlag clear_composite(composite_reference, false);
+			SetForScope<Assignment::Target> clear_reference(r_reference, Assignment::Target());
 			binary.right->visit(*this);
 		}
 
@@ -1573,8 +1574,14 @@ void UnusedVariableRemover::visit(Iteration &iter)
 	vector<Node *> saved_refs;
 	swap(loop_ext_refs, saved_refs);
 	{
+		if(iter.init_statement)
+			iter.init_statement->visit(*this);
 		SetForScope<unsigned> set_loop(in_loop, in_loop+1);
-		TraversingVisitor::visit(iter);
+		if(iter.condition)
+			iter.condition->visit(*this);
+		iter.body.visit(*this);
+		if(iter.loop_expression)
+			iter.loop_expression->visit(*this);
 	}
 	swap(loop_ext_refs, saved_refs);