X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=3cb10e862458903a0d07c2da1eec7465e3299ac5;hb=95312044b7b474af5671eb67f9df8debf96bf54c;hp=a8ff44a50e44fa94b8eb3d799f3ec1d64eb22988;hpb=c43203c52410ee8a734e775e7ee7368a12f82ff7;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index a8ff44a5..3cb10e86 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -1260,15 +1260,15 @@ bool UnusedVariableRemover::apply(Stage &s)
 
 	for(const auto &kvp: variables)
 	{
-		if(kvp.second.output)
+		if(!kvp.second.referenced)
+			unused_nodes.insert(kvp.first);
+		else if(kvp.second.output)
 		{
 			/* The last visible assignments of output variables are used by the
 			next stage or the API. */
 			for(AssignmentInfo *a: kvp.second.assignments)
 				unused_nodes.erase(a->node);
 		}
-		else if(!kvp.second.referenced)
-			unused_nodes.insert(kvp.first);
 	}
 
 	NodeRemover().apply(s, unused_nodes);
@@ -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);
 		}
 
@@ -1490,6 +1491,10 @@ void UnusedVariableRemover::visit(VariableDeclaration &var)
 	graphics API. */
 	var_info.output = (var.interface=="out" && (stage->type==Stage::FRAGMENT || var.linked_declaration || !var.name.compare(0, 3, "gl_")));
 
+	// Linked outputs are automatically referenced.
+	if(var_info.output && var.linked_declaration)
+		var_info.referenced = true;
+
 	if(var.init_expression)
 	{
 		var_info.initialized = true;