X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=7224df1efba672d4afb7ecb12923a0109ae9f6f6;hb=00be85f53c5bec0be00a7ed6271e1f5a38e0b534;hp=a68c8b96d7c9c40dc94a3bde6211f867652cd2db;hpb=fbc6438f24609a2553ac7e5741bfd469e14f8ff7;p=libs%2Fgl.git

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index a68c8b96..7224df1e 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -165,14 +165,13 @@ void ProgramCompiler::generate(Stage &stage)
 	apply<InterfaceGenerator>(stage);
 	apply<VariableResolver>(stage);
 	apply<VariableRenamer>(stage);
+	apply<DeclarationReorderer>(stage);
 	apply<LegacyConverter>(stage);
-	apply<VariableResolver>(stage);
 }
 
 bool ProgramCompiler::optimize(Stage &stage)
 {
 	apply<ConstantConditionEliminator>(stage);
-	apply<VariableResolver>(stage);
 
 	set<Node *> unused = apply<UnusedVariableLocator>(stage);
 	set<Node *> unused2 = apply<UnusedFunctionLocator>(stage);
@@ -184,8 +183,8 @@ bool ProgramCompiler::optimize(Stage &stage)
 
 void ProgramCompiler::inject_block(Block &target, const Block &source)
 {
-	list<NodePtr<Node> >::iterator insert_point = target.body.begin();
-	for(list<NodePtr<Node> >::const_iterator i=source.body.begin(); i!=source.body.end(); ++i)
+	list<RefPtr<Node> >::iterator insert_point = target.body.begin();
+	for(list<RefPtr<Node> >::const_iterator i=source.body.begin(); i!=source.body.end(); ++i)
 		target.body.insert(insert_point, (*i)->clone());
 }
 
@@ -281,7 +280,7 @@ void ProgramCompiler::Formatter::visit(Assignment &assign)
 void ProgramCompiler::Formatter::visit(FunctionCall &call)
 {
 	formatted += format("%s(", call.name);
-	for(vector<NodePtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+	for(vector<RefPtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
 	{
 		if(i!=call.arguments.begin())
 			formatted += ", ";
@@ -308,7 +307,7 @@ void ProgramCompiler::Formatter::visit(Block &block)
 
 	SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
 	string spaces(indent*2, ' ');
-	for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
 	{
 		if(i!=block.body.begin())
 			formatted += '\n';
@@ -394,7 +393,7 @@ void ProgramCompiler::Formatter::visit(InterfaceBlock &iface)
 void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
 {
 	formatted += format("%s %s(", func.return_type, func.name);
-	for(vector<NodePtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+	for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 	{
 		if(i!=func.parameters.begin())
 			formatted += ", ";
@@ -462,7 +461,7 @@ void ProgramCompiler::DeclarationCombiner::visit(Block &block)
 		return;
 
 	SetForScope<bool> set(toplevel, false);
-	for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		remove_node = false;
 		(*i)->visit(*this);
@@ -676,15 +675,13 @@ ProgramCompiler::BlockModifier::BlockModifier():
 
 void ProgramCompiler::BlockModifier::flatten_block(Block &block)
 {
-	for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
-		insert_nodes.push_back((*i)->clone());
+	insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end());
 	remove_node = true;
 }
 
-void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<NodePtr<Node> >::iterator &i)
+void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<RefPtr<Node> >::iterator &i)
 {
-	for(list<Node *>::iterator j=insert_nodes.begin(); j!=insert_nodes.end(); ++j)
-		block.body.insert(i, *j);
+	block.body.insert(i, insert_nodes.begin(), insert_nodes.end());
 	insert_nodes.clear();
 
 	if(remove_node)
@@ -696,7 +693,7 @@ void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<Node
 
 void ProgramCompiler::BlockModifier::visit(Block &block)
 {
-	for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
 		apply_and_increment(block, i);
@@ -730,15 +727,15 @@ void ProgramCompiler::InterfaceGenerator::apply(Stage &s)
 void ProgramCompiler::InterfaceGenerator::visit(Block &block)
 {
 	SetForScope<unsigned> set(scope_level, scope_level+1);
-	for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
 
 		if(scope_level==1)
 		{
-			for(map<string, VariableDeclaration *>::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
+			for(map<string, RefPtr<VariableDeclaration> >::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
 			{
-				list<NodePtr<Node> >::iterator k = block.body.insert(i, j->second);
+				list<RefPtr<Node> >::iterator k = block.body.insert(i, j->second);
 				(*k)->visit(*this);
 			}
 			iface_declarations.clear();
@@ -847,9 +844,9 @@ void ProgramCompiler::InterfaceGenerator::visit(Passthrough &pass)
 
 	for(map<string, VariableDeclaration *>::const_iterator i=stage->in_variables.begin(); i!=stage->in_variables.end(); ++i)
 		pass_vars.push_back(i->second);
-	for(map<string, VariableDeclaration *>::const_iterator i=iface_declarations.begin(); i!=iface_declarations.end(); ++i)
+	for(map<string, RefPtr<VariableDeclaration> >::const_iterator i=iface_declarations.begin(); i!=iface_declarations.end(); ++i)
 		if(i->second->interface=="in")
-			pass_vars.push_back(i->second);
+			pass_vars.push_back(i->second.get());
 
 	if(stage->previous)
 	{
@@ -921,6 +918,45 @@ void ProgramCompiler::VariableRenamer::visit(VariableDeclaration &var)
 }
 
 
+ProgramCompiler::DeclarationReorderer::DeclarationReorderer():
+	kind(NO_DECLARATION)
+{ }
+
+void ProgramCompiler::DeclarationReorderer::visit(Block &block)
+{
+	list<RefPtr<Node> >::iterator struct_insert_point = block.body.end();
+	list<RefPtr<Node> >::iterator variable_insert_point = block.body.end();
+
+	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	{
+		kind = NO_DECLARATION;
+		(*i)->visit(*this);
+
+		bool moved = false;
+		if(kind==STRUCT && struct_insert_point!=block.body.end())
+		{
+			block.body.insert(struct_insert_point, *i);
+			moved = true;
+		}
+		else if(kind>STRUCT && struct_insert_point==block.body.end())
+			struct_insert_point = i;
+
+		if(kind==VARIABLE && variable_insert_point!=block.body.end())
+		{
+			block.body.insert(variable_insert_point, *i);
+			moved = true;
+		}
+		else if(kind>VARIABLE && variable_insert_point==block.body.end())
+			variable_insert_point = i;
+
+		if(moved)
+			block.body.erase(i++);
+		else
+			++i;
+	}
+}
+
+
 ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator():
 	variable_values(0),
 	result(0.0f),
@@ -1032,7 +1068,7 @@ void ProgramCompiler::ConstantConditionEliminator::visit(Assignment &assign)
 void ProgramCompiler::ConstantConditionEliminator::visit(VariableDeclaration &var)
 {
 	if(var.constant || scope_level>1)
-		variable_values[&var] = &*var.init_expression;
+		variable_values[&var] = var.init_expression.get();
 }
 
 void ProgramCompiler::ConstantConditionEliminator::visit(Conditional &cond)
@@ -1180,7 +1216,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(FunctionDeclaration &func)
 {
 	assignments.push_back(BlockAssignmentMap());
 
-	for(vector<NodePtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+	for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 		(*i)->visit(*this);
 	func.body.visit(*this);
 
@@ -1286,10 +1322,10 @@ ProgramCompiler::NodeRemover::NodeRemover(const set<Node *> &r):
 
 void ProgramCompiler::NodeRemover::visit(Block &block)
 {
-	for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
-		if(to_remove.count(&**i))
+		if(to_remove.count(i->get()))
 			block.body.erase(i++);
 		else
 			++i;
@@ -1306,7 +1342,7 @@ void ProgramCompiler::NodeRemover::visit(VariableDeclaration &var)
 		if(var.linked_declaration)
 			var.linked_declaration->linked_declaration = 0;
 	}
-	else if(var.init_expression && to_remove.count(&*var.init_expression))
+	else if(var.init_expression && to_remove.count(var.init_expression.get()))
 		var.init_expression = 0;
 }
 
@@ -1347,7 +1383,7 @@ void ProgramCompiler::LegacyConverter::visit(FunctionCall &call)
 {
 	if(call.name=="texture" && !call.declaration && !check_version(Version(1, 30)))
 	{
-		vector<NodePtr<Expression> >::iterator i = call.arguments.begin();
+		vector<RefPtr<Expression> >::iterator i = call.arguments.begin();
 		if(i!=call.arguments.end())
 		{
 			(*i)->visit(*this);