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

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index f345670b..33876672 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;
 			}
 	}