X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=4550b51c29360997e12c728208cb7c1decca0ba5;hb=59347f76bc985e8c9c769d4a3eee672cba9c920b;hp=f345670b0451d462f0b1083eb047b605e4a006bb;hpb=d9d7ab44d5f88c4537906e77c49db06d6bdc099c;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index f345670b..4550b51c 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -8,9 +8,27 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-void ConstantIdAssigner::apply(Stage &stage)
+void ConstantIdAssigner::apply(Module &module, const Features &features)
 {
-	stage.content.visit(*this);
+	for(list<Stage>::iterator i=module.stages.begin(); i!=module.stages.end(); ++i)
+		i->content.visit(*this);
+
+	for(vector<VariableDeclaration *>::iterator i=auto_constants.begin(); i!=auto_constants.end(); ++i)
+	{
+		unsigned id = hash32((*i)->name)%features.constant_id_range;
+		while(used_ids.count(id))
+			id = (id+1)%features.constant_id_range;
+
+		vector<Layout::Qualifier> &qualifiers = (*i)->layout->qualifiers;
+		for(vector<Layout::Qualifier>::iterator j=qualifiers.begin(); j!=qualifiers.end(); ++j)
+			if(j->name=="constant_id")
+			{
+				j->value = id;
+				break;
+			}
+
+		used_ids.insert(id);
+	}
 }
 
 void ConstantIdAssigner::visit(VariableDeclaration &var)
@@ -22,7 +40,9 @@ void ConstantIdAssigner::visit(VariableDeclaration &var)
 			if(i->name=="constant_id" && i->has_value)
 			{
 				if(i->value==-1)
-					i->value = hash32(var.name)&0x7FFFFFFF;
+					auto_constants.push_back(&var);
+				else
+					used_ids.insert(i->value);
 				break;
 			}
 	}
@@ -114,7 +134,7 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration
 
 InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
 {
-	if(stage->interface_blocks.count("in"+out_block.block_name))
+	if(stage->interface_blocks.count("in "+out_block.block_name))
 		return 0;
 
 	InterfaceBlock *in_block = new InterfaceBlock;
@@ -140,9 +160,9 @@ InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block
 	}
 
 	iface_target_block->body.insert(iface_insert_point, in_block);
-	stage->interface_blocks.insert(make_pair("in"+in_block->block_name, in_block));
+	stage->interface_blocks.insert(make_pair("in "+in_block->block_name, in_block));
 	if(!in_block->instance_name.empty())
-		stage->interface_blocks.insert(make_pair("_"+in_block->instance_name, in_block));
+		stage->interface_blocks.insert(make_pair(in_block->instance_name, in_block));
 
 	SetFlag set_scope(function_scope, false);
 	SetForScope<Block *> set_block(current_block, &stage->content);
@@ -195,7 +215,7 @@ void InterfaceGenerator::visit(VariableReference &var)
 	}
 
 	const map<string, InterfaceBlock *> &prev_blocks = stage->previous->interface_blocks;
-	map<string, InterfaceBlock *>::const_iterator j = prev_blocks.find("_"+var.name);
+	map<string, InterfaceBlock *>::const_iterator j = prev_blocks.find(var.name);
 	if(j!=prev_blocks.end() && j->second->interface=="out")
 	{
 		generate_interface(*j->second);
@@ -271,7 +291,7 @@ void InterfaceGenerator::visit(InterfaceBlock &iface)
 		if(!iface.linked_block && stage->previous)
 		{
 			const map<string, InterfaceBlock *> &prev_blocks = stage->previous->interface_blocks;
-			map<string, InterfaceBlock *>::const_iterator i = prev_blocks.find("out"+iface.block_name);
+			map<string, InterfaceBlock *>::const_iterator i = prev_blocks.find("out "+iface.block_name);
 			if(i!=prev_blocks.end())
 			{
 				iface.linked_block = i->second;