X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=f9a14f2f00a119ffbd7ba7604fd36a84e5a96585;hb=6b89fb751617dd51eddf2adcc55e9a8da66f8e84;hp=14c9d3d3ced42958e539e7ef27a6623f297e41cb;hpb=94c4f0983dcaeae21b911b3a79a9e0eb656fb84a;p=libs%2Fgl.git

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 14c9d3d3..f9a14f2f 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -368,7 +368,17 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
 	if(!var.sampling.empty())
 		formatted += format("%s ", var.sampling);
 	if(!var.interface.empty() && var.interface!=block_interface)
-		formatted += format("%s ", var.interface);
+	{
+		string interface = var.interface;
+		if(stage->required_version<Version(1, 30))
+		{
+			if(stage->type==VERTEX && var.interface=="in")
+				interface = "attribute";
+			else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
+				interface = "varying";
+		}
+		formatted += format("%s ", interface);
+	}
 	formatted += format("%s %s", var.type, var.name);
 	if(var.array)
 	{
@@ -1229,8 +1239,7 @@ void ProgramCompiler::UnusedVariableLocator::apply(Stage &s)
 		if(!i->second.referenced)
 		{
 			unused_nodes.insert(i->first);
-			for(vector<Node *>::iterator j=i->second.assignments.begin(); j!=i->second.assignments.end(); ++j)
-				unused_nodes.insert(*j);
+			clear_assignments(i->second, true);
 		}
 	}
 	variables.pop_back();
@@ -1282,11 +1291,21 @@ void ProgramCompiler::UnusedVariableLocator::record_assignment(VariableDeclarati
 {
 	VariableInfo &var_info = variables.back()[&var];
 	if(!self_ref)
-		var_info.assignments.clear();
+		clear_assignments(var_info, true);
 	var_info.assignments.push_back(&node);
 	var_info.conditionally_assigned = false;
 }
 
+void ProgramCompiler::UnusedVariableLocator::clear_assignments(VariableInfo &var_info, bool mark_unused)
+{
+	if(mark_unused)
+	{
+		for(vector<Node *>::iterator i=var_info.assignments.begin(); i!=var_info.assignments.end(); ++i)
+			unused_nodes.insert(*i);
+	}
+	var_info.assignments.clear();
+}
+
 void ProgramCompiler::UnusedVariableLocator::visit(ExpressionStatement &expr)
 {
 	assignment = 0;
@@ -1337,6 +1356,8 @@ void ProgramCompiler::UnusedVariableLocator::visit(FunctionDeclaration &func)
 	BlockVariableMap &block_variables = variables.back();
 	for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i)
 		i->second.conditionally_assigned = true;
+	for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+		block_variables[i->get()].referenced = true;
 	merge_down_variables();
 }
 
@@ -1350,8 +1371,7 @@ void ProgramCompiler::UnusedVariableLocator::merge_down_variables()
 		{
 			if(!i->second.referenced)
 				unused_nodes.insert(i->first);
-			for(vector<Node *>::iterator j=i->second.assignments.begin(); j!=i->second.assignments.end(); ++j)
-				unused_nodes.insert(*j);
+			clear_assignments(i->second, true);
 			continue;
 		}
 
@@ -1360,11 +1380,9 @@ void ProgramCompiler::UnusedVariableLocator::merge_down_variables()
 			parent_variables.insert(*i);
 		else
 		{
-			if(!i->second.conditionally_assigned)
-			{
-				j->second.assignments.clear();
-				j->second.conditionally_assigned = true;
-			}
+			if(i->second.referenced || !i->second.conditionally_assigned)
+				clear_assignments(j->second, !i->second.referenced);
+			j->second.conditionally_assigned = i->second.conditionally_assigned;
 			j->second.referenced |= i->second.referenced;
 			j->second.assignments.insert(j->second.assignments.end(), i->second.assignments.begin(), i->second.assignments.end());
 		}
@@ -1439,7 +1457,7 @@ void ProgramCompiler::UnusedFunctionLocator::visit(FunctionDeclaration &func)
 {
 	TraversingVisitor::visit(func);
 
-	if(func.name!="main" && !used_definitions.count(&func))
+	if((func.name!="main" || func.body.body.empty()) && !used_definitions.count(&func))
 		unused_nodes.insert(&func);
 }
 
@@ -1561,11 +1579,7 @@ void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var)
 
 	if((var.interface=="in" || var.interface=="out") && !check_version(Version(1, 30)))
 	{
-		if(stage->type==VERTEX && var.interface=="in")
-			var.interface = "attribute";
-		else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
-			var.interface = "varying";
-		else if(stage->type==FRAGMENT && var.interface=="out")
+		if(stage->type==FRAGMENT && var.interface=="out")
 		{
 			frag_out_name = var.name;
 			remove_node = true;