X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=1b9b41de20e07a63ff38cb7e6f984d7311df9664;hb=6ef956d2f41512081e6c19d41a1230e177547dde;hp=ea0f96f0e60920cba9dd23523e83c37a07133ffb;hpb=1420854eb3827b8229bae2c2c6cebdd34a320f13;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index ea0f96f0..1b9b41de 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -191,12 +191,6 @@ void InlineContentInjector::visit(VariableReference &var)
 		referenced_names.insert(var.name);
 }
 
-void InlineContentInjector::visit(InterfaceBlockReference &iface)
-{
-	if(pass==REFERENCED)
-		referenced_names.insert(iface.name);
-}
-
 void InlineContentInjector::visit(FunctionCall &call)
 {
 	if(pass==REFERENCED)
@@ -449,7 +443,7 @@ void ExpressionInliner::visit(Assignment &assign)
 			if(targets_overlap(i->first, assign.target))
 				i->second->blocked = true;
 
-		expressions.push_back(ExpressionInfo());
+		expressions.emplace_back();
 		ExpressionInfo &info = expressions.back();
 		info.target = assign.target;
 		// Self-referencing assignments can't be inlined without additional work.
@@ -496,7 +490,7 @@ void ExpressionInliner::visit(VariableDeclaration &var)
 	analyze and non-trivial expressions could be expensive to inline.  */
 	if((current_block->parent || (constant && r_trivial)) && var.interface.empty())
 	{
-		expressions.push_back(ExpressionInfo());
+		expressions.emplace_back();
 		ExpressionInfo &info = expressions.back();
 		info.target = &var;
 		/* Assume variables declared in an iteration initialization statement
@@ -1246,11 +1240,6 @@ void UnusedTypeRemover::visit(VariableDeclaration &var)
 	TraversingVisitor::visit(var);
 }
 
-void UnusedTypeRemover::visit(InterfaceBlock &iface)
-{
-	unused_nodes.erase(iface.type_declaration);
-}
-
 void UnusedTypeRemover::visit(FunctionDeclaration &func)
 {
 	unused_nodes.erase(func.return_type_declaration);
@@ -1313,14 +1302,6 @@ void UnusedVariableRemover::visit(VariableReference &var)
 		referenced(var.declaration, var);
 }
 
-void UnusedVariableRemover::visit(InterfaceBlockReference &iface)
-{
-	if(composite_reference)
-		r_reference.declaration = iface.declaration;
-	else if(iface.declaration)
-		referenced(iface.declaration, iface);
-}
-
 void UnusedVariableRemover::visit_composite(Expression &expr)
 {
 	if(!composite_reference)
@@ -1420,7 +1401,7 @@ void UnusedVariableRemover::visit(FunctionCall &call)
 
 void UnusedVariableRemover::record_assignment(const Assignment::Target &target, Node &node)
 {
-	assignments.push_back(AssignmentInfo());
+	assignments.emplace_back();
 	AssignmentInfo &assign_info = assignments.back();
 	assign_info.node = &node;
 	assign_info.target = target;
@@ -1474,7 +1455,8 @@ void UnusedVariableRemover::visit(VariableDeclaration &var)
 
 	/* Mark variables as output if they're used by the next stage or the
 	graphics API. */
-	var_info.output = (var.interface=="out" && (stage->type==Stage::FRAGMENT || var.linked_declaration || !var.name.compare(0, 3, "gl_")));
+	bool builtin = (!var.name.compare(0, 3, "gl_") || (var.block_declaration && !var.block_declaration->block_name.compare(0, 3, "gl_")));
+	var_info.output = (var.interface=="out" && (stage->type==Stage::FRAGMENT || var.linked_declaration || builtin));
 
 	// Linked outputs are automatically referenced.
 	if(var_info.output && var.linked_declaration)
@@ -1487,12 +1469,6 @@ void UnusedVariableRemover::visit(VariableDeclaration &var)
 	}
 }
 
-void UnusedVariableRemover::visit(InterfaceBlock &iface)
-{
-	VariableInfo &var_info = variables[&iface];
-	var_info.output = (iface.interface=="out" && (iface.linked_block || !iface.block_name.compare(0, 3, "gl_")));
-}
-
 void UnusedVariableRemover::merge_variables(const BlockVariableMap &other_vars)
 {
 	for(const auto &kvp: other_vars)