Only generate or link interfaces in the correct scope

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

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 064d217e7da7b9b47f2c90dbab59a8f5006f9a77..3ff04eb9890124f7098c015dafe1099d77d7d34e 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -10,7 +10,7 @@ namespace SL {
 
 void DeclarationCombiner::apply(Stage &stage)
 {
-       visit(stage.content);
+       stage.content.visit(*this);
        NodeRemover().apply(stage, nodes_to_remove);
 }
 
@@ -52,8 +52,9 @@ void DeclarationCombiner::visit(VariableDeclaration &var)
                                {
                                        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)
+                                               if(j->name==i->name)
                                                {
+                                                       j->has_value = i->value;
                                                        j->value = i->value;
                                                        found = true;
                                                }
@@ -72,15 +73,14 @@ void DeclarationCombiner::visit(VariableDeclaration &var)
 }
 
 
-void BlockResolver::visit(Block &block)
+void BlockResolver::enter(Block &block)
 {
        block.parent = current_block;
-       TraversingVisitor::visit(block);
 }
 
 void BlockResolver::visit(InterfaceBlock &iface)
 {
-       iface.members.anonymous = true;
+       current_block->interfaces.insert(&iface);
        TraversingVisitor::visit(iface);
 }
 
@@ -95,7 +95,7 @@ void VariableResolver::apply(Stage &stage)
 {
        Stage *builtin_stage = get_builtins(stage.type);
        builtins = (builtin_stage ? &builtin_stage->content : 0);
-       visit(stage.content);
+       stage.content.visit(*this);
 }
 
 Block *VariableResolver::next_block(Block &block)
@@ -103,12 +103,9 @@ Block *VariableResolver::next_block(Block &block)
        return block.parent ? block.parent : &block!=builtins ? builtins : 0;
 }
 
-void VariableResolver::visit(Block &block)
+void VariableResolver::enter(Block &block)
 {
-       if(current_block!=&block)
-               block.variables.clear();
-
-       TraversingVisitor::visit(block);
+       block.variables.clear();
 }
 
 void VariableResolver::visit(VariableReference &var)
@@ -117,11 +114,23 @@ void VariableResolver::visit(VariableReference &var)
        type = 0;
        for(Block *block=current_block; block; block=next_block(*block))
        {
-               map<string, VariableDeclaration *>::iterator j = block->variables.find(var.name);
-               if(j!=block->variables.end())
+               map<string, VariableDeclaration *>::iterator i = block->variables.find(var.name);
+               if(i!=block->variables.end())
+                       var.declaration = i->second;
+               else
                {
-                       var.declaration = j->second;
-                       type = j->second->type_declaration;
+                       const set<InterfaceBlock *> &ifaces = block->interfaces;
+                       for(set<InterfaceBlock *>::const_iterator j=ifaces.begin(); (!var.declaration && j!=ifaces.end()); ++j)
+                       {
+                               i = (*j)->members.variables.find(var.name);
+                               if(i!=(*j)->members.variables.end())
+                                       var.declaration = i->second;
+                       }
+               }
+
+               if(var.declaration)
+               {
+                       type = var.declaration->type_declaration;
                        break;
                }
        }
@@ -211,8 +220,6 @@ void VariableResolver::visit(VariableDeclaration &var)
 
        TraversingVisitor::visit(var);
        current_block->variables[var.name] = &var;
-       if(current_block->anonymous && current_block->parent)
-               current_block->parent->variables[var.name] = &var;
 }
 
 void VariableResolver::visit(InterfaceBlock &iface)
@@ -221,20 +228,6 @@ void VariableResolver::visit(InterfaceBlock &iface)
        TraversingVisitor::visit(iface);
 }
 
-void VariableResolver::visit(FunctionDeclaration &func)
-{
-       SetForScope<Block *> set_block(current_block, &func.body);
-       func.body.variables.clear();
-       TraversingVisitor::visit(func);
-}
-
-void VariableResolver::visit(Iteration &iter)
-{
-       SetForScope<Block *> set_block(current_block, &iter.body);
-       iter.body.variables.clear();
-       TraversingVisitor::visit(iter);
-}
-
 
 void FunctionResolver::visit(FunctionCall &call)
 {
@@ -265,7 +258,8 @@ void FunctionResolver::visit(FunctionDeclaration &func)
 
 
 InterfaceGenerator::InterfaceGenerator():
-       stage(0)
+       stage(0),
+       function_scope(false)
 { }
 
 string InterfaceGenerator::get_out_prefix(Stage::Type type)
@@ -284,7 +278,7 @@ void InterfaceGenerator::apply(Stage &s)
        if(stage->previous)
                in_prefix = get_out_prefix(stage->previous->type);
        out_prefix = get_out_prefix(stage->type);
-       visit(s.content);
+       s.content.visit(*this);
        NodeRemover().apply(s, nodes_to_remove);
 }
 
@@ -309,8 +303,7 @@ string InterfaceGenerator::change_prefix(const string &name, const string &prefi
 
 bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
 {
-       const map<string, VariableDeclaration *> &stage_vars = (iface=="in" ? stage->in_variables : stage->out_variables);
-       if(stage_vars.count(name))
+       if(stage->content.variables.count(name))
                return false;
 
        VariableDeclaration* iface_var = new VariableDeclaration;
@@ -326,12 +319,12 @@ bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const stri
        if(iface_var->array)
                iface_var->array_size = var.array_size;
        if(iface=="in")
-               iface_var->linked_declaration = &var;
-       stage->content.body.insert(iface_insert_point, iface_var);
        {
-               SetForScope<Block *> set_block(current_block, &stage->content);
-               iface_var->visit(*this);
+               iface_var->linked_declaration = &var;
+               var.linked_declaration = iface_var;
        }
+       stage->content.body.insert(iface_insert_point, iface_var);
+       stage->content.variables[name] = iface_var;
 
        return true;
 }
@@ -357,12 +350,16 @@ void InterfaceGenerator::visit(VariableReference &var)
 {
        if(var.declaration || !stage->previous)
                return;
+       /* Don't pull a variable from previous stage if we just generated an out
+       interface in this stage */
+       if(stage->content.variables.count(var.name))
+               return;
 
-       const map<string, VariableDeclaration *> &prev_out = stage->previous->out_variables;
-       map<string, VariableDeclaration *>::const_iterator i = prev_out.find(var.name);
-       if(i==prev_out.end())
-               i = prev_out.find(in_prefix+var.name);
-       if(i!=prev_out.end())
+       const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
+       map<string, VariableDeclaration *>::const_iterator i = prev_vars.find(var.name);
+       if(i==prev_vars.end() || i->second->interface!="out")
+               i = prev_vars.find(in_prefix+var.name);
+       if(i!=prev_vars.end() && i->second->interface=="out")
        {
                generate_interface(*i->second, "in", i->second->name);
                var.name = i->second->name;
@@ -373,9 +370,9 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
 {
        if(var.interface=="out")
        {
-               if(current_block==&stage->content)
-                       stage->out_variables[var.name] = &var;
-               else if(generate_interface(var, "out", change_prefix(var.name, string())))
+               /* For out variables in function scope, generate a global interface and
+               replace the local declaration with an assignment. */
+               if(function_scope && generate_interface(var, "out", var.name))
                {
                        nodes_to_remove.insert(&var);
                        if(var.init_expression)
@@ -389,14 +386,13 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
        }
        else if(var.interface=="in")
        {
-               stage->in_variables[var.name] = &var;
-               if(var.linked_declaration)
-                       var.linked_declaration->linked_declaration = &var;
-               else if(stage->previous)
+               /* Try to link in variables in global scope with out variables from
+               previous stage */
+               if(current_block==&stage->content && !var.linked_declaration && stage->previous)
                {
-                       const map<string, VariableDeclaration *> &prev_out = stage->previous->out_variables;
-                       map<string, VariableDeclaration *>::const_iterator i = prev_out.find(var.name);
-                       if(i!=prev_out.end())
+                       const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
+                       map<string, VariableDeclaration *>::const_iterator i = prev_vars.find(var.name);
+                       if(i!=prev_vars.end() && i->second->interface=="out")
                        {
                                var.linked_declaration = i->second;
                                i->second->linked_declaration = &var;
@@ -407,17 +403,25 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
        TraversingVisitor::visit(var);
 }
 
+void InterfaceGenerator::visit(FunctionDeclaration &func)
+{
+       SetFlag set_scope(function_scope, true);
+       // Skip parameters because they're not useful here
+       func.body.visit(*this);
+}
+
 void InterfaceGenerator::visit(Passthrough &pass)
 {
        vector<VariableDeclaration *> pass_vars;
 
-       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=stage->content.variables.begin(); i!=stage->content.variables.end(); ++i)
+               if(i->second->interface=="in")
+                       pass_vars.push_back(i->second);
 
        if(stage->previous)
        {
-               const map<string, VariableDeclaration *> &prev_out = stage->previous->out_variables;
-               for(map<string, VariableDeclaration *>::const_iterator i=prev_out.begin(); i!=prev_out.end(); ++i)
+               const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
+               for(map<string, VariableDeclaration *>::const_iterator i=prev_vars.begin(); i!=prev_vars.end(); ++i)
                {
                        bool linked = false;
                        for(vector<VariableDeclaration *>::const_iterator j=pass_vars.begin(); (!linked && j!=pass_vars.end()); ++j)