Make constant id range configurable and avoid duplicates

[libs/gl.git] / source / glsl / generate.cpp

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 13fb72c53039bfbd7e9fed3779bc718bdc6801d7..92d172c586469f78cd17c5d338700fc68e503c00 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -8,55 +8,44 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-ConstantSpecializer::ConstantSpecializer():
-       values(0)
-{ }
-
-void ConstantSpecializer::apply(Stage &stage, const map<string, int> *v)
+void ConstantIdAssigner::apply(Module &module, const Features &features)
 {
-       values = v;
-       stage.content.visit(*this);
-}
+       for(list<Stage>::iterator i=module.stages.begin(); i!=module.stages.end(); ++i)
+               i->content.visit(*this);
 
-void ConstantSpecializer::visit(VariableDeclaration &var)
-{
-       bool specializable = false;
-       if(var.layout)
+       unsigned max_id = features.max_constant_id;
+       for(vector<VariableDeclaration *>::iterator i=auto_constants.begin(); i!=auto_constants.end(); ++i)
        {
-               vector<Layout::Qualifier> &qualifiers = var.layout->qualifiers;
-               for(vector<Layout::Qualifier>::iterator i=qualifiers.begin(); i!=qualifiers.end(); ++i)
-                       if(i->name=="constant_id")
+               unsigned id = hash32((*i)->name)%(max_id+1);
+               while(used_ids.count(id))
+                       ++id;
+
+               vector<Layout::Qualifier> &qualifiers = (*i)->layout->qualifiers;
+               for(vector<Layout::Qualifier>::iterator j=qualifiers.begin(); j!=qualifiers.end(); ++j)
+                       if(j->name=="constant_id")
                        {
-                               specializable = true;
-                               if(values)
-                                       qualifiers.erase(i);
-                               else if(i->value==-1)
-                                       i->value = hash32(var.name)&0x7FFFFFFF;
+                               j->value = id;
                                break;
                        }
 
-               if(qualifiers.empty())
-                       var.layout = 0;
+               used_ids.insert(id);
        }
+}
 
-       if(specializable && values)
+void ConstantIdAssigner::visit(VariableDeclaration &var)
+{
+       if(var.layout)
        {
-               map<string, int>::const_iterator i = values->find(var.name);
-               if(i!=values->end())
-               {
-                       RefPtr<Literal> literal = new Literal;
-                       if(var.type=="bool")
-                       {
-                               literal->token = (i->second ? "true" : "false");
-                               literal->value = static_cast<bool>(i->second);
-                       }
-                       else if(var.type=="int")
+               vector<Layout::Qualifier> &qualifiers = var.layout->qualifiers;
+               for(vector<Layout::Qualifier>::iterator i=qualifiers.begin(); i!=qualifiers.end(); ++i)
+                       if(i->name=="constant_id" && i->has_value)
                        {
-                               literal->token = lexical_cast<string>(i->second);
-                               literal->value = i->second;
+                               if(i->value==-1)
+                                       auto_constants.push_back(&var);
+                               else
+                                       used_ids.insert(i->value);
+                               break;
                        }
-                       var.init_expression = literal;
-               }
        }
 }