X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=5027dc9b79788783c0e2cc5860fa91c39b232ef2;hp=6b8d2eb8a6ae75bbd7d5ea74c7fe7bde4e4b39b6;hb=8468279a03d906f79fb6158162c7970d4d7fff60;hpb=7189f63c549e9061789c47726ff8d6d12afca1a0

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 6b8d2eb8..5027dc9b 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -168,7 +168,7 @@ void ProgramCompiler::append_stage(Stage &stage)
 		target = &*i;
 	}
 
-	for(NodeList<Node>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
+	for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
 		target->content.body.push_back(*i);
 	apply<DeclarationCombiner>(*target);
 }
@@ -241,8 +241,8 @@ void ProgramCompiler::finalize(Stage &stage)
 
 void ProgramCompiler::inject_block(Block &target, const Block &source)
 {
-	list<RefPtr<Node> >::iterator insert_point = target.body.begin();
-	for(list<RefPtr<Node> >::const_iterator i=source.body.begin(); i!=source.body.end(); ++i)
+	NodeList<Statement>::iterator insert_point = target.body.begin();
+	for(NodeList<Statement>::const_iterator i=source.body.begin(); i!=source.body.end(); ++i)
 		target.body.insert(insert_point, (*i)->clone());
 }
 
@@ -284,7 +284,7 @@ void ProgramCompiler::BlockModifier::flatten_block(Block &block)
 	remove_node = true;
 }
 
-void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<RefPtr<Node> >::iterator &i)
+void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, NodeList<Statement>::iterator &i)
 {
 	block.body.insert(i, insert_nodes.begin(), insert_nodes.end());
 	insert_nodes.clear();
@@ -298,7 +298,7 @@ void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list<RefP
 
 void ProgramCompiler::BlockModifier::visit(Block &block)
 {
-	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
 		apply_and_increment(block, i);
@@ -383,7 +383,7 @@ void ProgramCompiler::Formatter::visit(Assignment &assign)
 void ProgramCompiler::Formatter::visit(FunctionCall &call)
 {
 	formatted += format("%s(", call.name);
-	for(vector<RefPtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
 	{
 		if(i!=call.arguments.begin())
 			formatted += ", ";
@@ -410,7 +410,7 @@ void ProgramCompiler::Formatter::visit(Block &block)
 
 	SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
 	string spaces(indent*2, ' ');
-	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
 	{
 		if(i!=block.body.begin())
 			formatted += '\n';
@@ -515,7 +515,7 @@ void ProgramCompiler::Formatter::visit(InterfaceBlock &iface)
 void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
 {
 	formatted += format("%s %s(", func.return_type, func.name);
-	for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+	for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 	{
 		if(i!=func.parameters.begin())
 			formatted += ", ";
@@ -643,6 +643,27 @@ void ProgramCompiler::DeclarationCombiner::visit(VariableDeclaration &var)
 		ptr->type = var.type;
 		if(var.init_expression)
 			ptr->init_expression = var.init_expression;
+		if(var.layout)
+		{
+			if(ptr->layout)
+			{
+				for(vector<Layout::Qualifier>::iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ++i)
+				{
+					bool found = false;
+					for(vector<Layout::Qualifier>::iterator j=ptr->layout->qualifiers.begin(); (!found && j!=ptr->layout->qualifiers.end()); ++j)
+						if(j->identifier==i->identifier)
+						{
+							j->value = i->value;
+							found = true;
+						}
+
+					if(!found)
+						ptr->layout->qualifiers.push_back(*i);
+				}
+			}
+			else
+				ptr->layout = var.layout;
+		}
 		remove_node = true;
 	}
 	else
@@ -844,7 +865,7 @@ void ProgramCompiler::InterfaceGenerator::apply(Stage &s)
 void ProgramCompiler::InterfaceGenerator::visit(Block &block)
 {
 	SetForScope<unsigned> set(scope_level, scope_level+1);
-	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
 
@@ -852,7 +873,7 @@ void ProgramCompiler::InterfaceGenerator::visit(Block &block)
 		{
 			for(map<string, RefPtr<VariableDeclaration> >::iterator j=iface_declarations.begin(); j!=iface_declarations.end(); ++j)
 			{
-				list<RefPtr<Node> >::iterator k = block.body.insert(i, j->second);
+				NodeList<Statement>::iterator k = block.body.insert(i, j->second);
 				(*k)->visit(*this);
 			}
 			iface_declarations.clear();
@@ -1048,13 +1069,13 @@ void ProgramCompiler::DeclarationReorderer::visit(Block &block)
 	if(scope_level>1)
 		return Visitor::visit(block);
 
-	list<RefPtr<Node> >::iterator struct_insert_point = block.body.end();
-	list<RefPtr<Node> >::iterator variable_insert_point = block.body.end();
-	list<RefPtr<Node> >::iterator function_insert_point = block.body.end();
+	NodeList<Statement>::iterator struct_insert_point = block.body.end();
+	NodeList<Statement>::iterator variable_insert_point = block.body.end();
+	NodeList<Statement>::iterator function_insert_point = block.body.end();
 	unsigned unordered_func_count = 0;
 	bool ordered_any_funcs = false;
 
-	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		kind = NO_DECLARATION;
 		(*i)->visit(*this);
@@ -1189,7 +1210,7 @@ void ProgramCompiler::FunctionInliner::visit(Block &block)
 	if(extract_result)
 		--extract_result;
 
-	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
 	{
 		(*i)->visit(*this);
 		if(extract_result)
@@ -1218,7 +1239,7 @@ void ProgramCompiler::FunctionInliner::visit(MemberAccess &memacc)
 
 void ProgramCompiler::FunctionInliner::visit(FunctionCall &call)
 {
-	for(vector<RefPtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
 		visit_and_inline(*i);
 
 	FunctionDeclaration *def = call.declaration;
@@ -1552,7 +1573,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(FunctionDeclaration &func)
 
 	{
 		SetForScope<bool> set(global_scope, false);
-		for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+		for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 			(*i)->visit(*this);
 		func.body.visit(*this);
 	}
@@ -1560,7 +1581,7 @@ 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)
+	for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 		block_variables[i->get()].referenced = true;
 	merge_down_variables();
 }
@@ -1672,7 +1693,7 @@ ProgramCompiler::NodeRemover::NodeRemover(const set<Node *> &r):
 
 void ProgramCompiler::NodeRemover::visit(Block &block)
 {
-	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
+	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
 		if(to_remove.count(i->get()))
@@ -1838,7 +1859,7 @@ void ProgramCompiler::LegacyConverter::visit(FunctionCall &call)
 {
 	if(call.name=="texture" && !call.declaration && !supports_unified_sampling_functions())
 	{
-		vector<RefPtr<Expression> >::iterator i = call.arguments.begin();
+		NodeArray<Expression>::iterator i = call.arguments.begin();
 		if(i!=call.arguments.end())
 		{
 			(*i)->visit(*this);