Avoid incorrectly matching interfaces in certain cases

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

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index ac16c31f889dce86ae02541121802d84b59a496e..952f1f0bfa4f1bddb2e1bc7585f3829fda9ce78b 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -8,22 +8,17 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-DeclarationCombiner::DeclarationCombiner():
-       toplevel(true)
-{ }
-
 void DeclarationCombiner::apply(Stage &stage)
 {
-       visit(stage.content);
+       stage.content.visit(*this);
        NodeRemover().apply(stage, nodes_to_remove);
 }
 
 void DeclarationCombiner::visit(Block &block)
 {
-       if(!toplevel)
+       if(current_block)
                return;
 
-       SetForScope<bool> set(toplevel, false);
        TraversingVisitor::visit(block);
 }
 
@@ -57,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;
                                                }
@@ -77,8 +73,20 @@ void DeclarationCombiner::visit(VariableDeclaration &var)
 }
 
 
+void BlockResolver::visit(Block &block)
+{
+       block.parent = current_block;
+       TraversingVisitor::visit(block);
+}
+
+void BlockResolver::visit(InterfaceBlock &iface)
+{
+       iface.members.anonymous = true;
+       TraversingVisitor::visit(iface);
+}
+
+
 VariableResolver::VariableResolver():
-       anonymous(false),
        record_target(false),
        assignment_target(0),
        self_referencing(false)
@@ -86,31 +94,32 @@ VariableResolver::VariableResolver():
 
 void VariableResolver::apply(Stage &stage)
 {
-       Stage *builtins = get_builtins(stage.type);
-       if(builtins)
-               blocks.push_back(&builtins->content);
-       visit(stage.content);
-       if(builtins)
-               blocks.pop_back();
+       Stage *builtin_stage = get_builtins(stage.type);
+       builtins = (builtin_stage ? &builtin_stage->content : 0);
+       stage.content.visit(*this);
+}
+
+Block *VariableResolver::next_block(Block &block)
+{
+       return block.parent ? block.parent : &block!=builtins ? builtins : 0;
 }
 
 void VariableResolver::visit(Block &block)
 {
-       blocks.push_back(&block);
-       block.variables.clear();
+       if(current_block!=&block)
+               block.variables.clear();
+
        TraversingVisitor::visit(block);
-       blocks.pop_back();
 }
 
 void VariableResolver::visit(VariableReference &var)
 {
        var.declaration = 0;
        type = 0;
-       for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
+       for(Block *block=current_block; block; block=next_block(*block))
        {
-               --i;
-               map<string, VariableDeclaration *>::iterator j = (*i)->variables.find(var.name);
-               if(j!=(*i)->variables.end())
+               map<string, VariableDeclaration *>::iterator j = block->variables.find(var.name);
+               if(j!=block->variables.end())
                {
                        var.declaration = j->second;
                        type = j->second->type_declaration;
@@ -186,16 +195,15 @@ void VariableResolver::visit(Assignment &assign)
 void VariableResolver::visit(StructDeclaration &strct)
 {
        TraversingVisitor::visit(strct);
-       blocks.back()->types[strct.name] = &strct;
+       current_block->types[strct.name] = &strct;
 }
 
 void VariableResolver::visit(VariableDeclaration &var)
 {
-       for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
+       for(Block *block=current_block; block; block=next_block(*block))
        {
-               --i;
-               map<string, StructDeclaration *>::iterator j = (*i)->types.find(var.type);
-               if(j!=(*i)->types.end())
+               map<string, StructDeclaration *>::iterator j = block->types.find(var.type);
+               if(j!=block->types.end())
                        var.type_declaration = j->second;
        }
 
@@ -203,18 +211,31 @@ void VariableResolver::visit(VariableDeclaration &var)
                var.interface = block_interface;
 
        TraversingVisitor::visit(var);
-       blocks.back()->variables[var.name] = &var;
-       if(anonymous && blocks.size()>1)
-               blocks[blocks.size()-2]->variables[var.name] = &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)
 {
-       SetFlag set(anonymous);
-       SetForScope<string> set2(block_interface, iface.interface);
+       SetForScope<string> set_iface(block_interface, iface.interface);
        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)
 {
@@ -245,9 +266,7 @@ void FunctionResolver::visit(FunctionDeclaration &func)
 
 
 InterfaceGenerator::InterfaceGenerator():
-       stage(0),
-       scope_level(0),
-       current_block(0)
+       stage(0)
 { }
 
 string InterfaceGenerator::get_out_prefix(Stage::Type type)
@@ -266,18 +285,17 @@ 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);
 }
 
 void InterfaceGenerator::visit(Block &block)
 {
-       SetForScope<unsigned> set(scope_level, scope_level+1);
        SetForScope<Block *> set_block(current_block, &block);
        for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
        {
                assignment_insert_point = i;
-               if(scope_level==1)
+               if(&block==&stage->content)
                        iface_insert_point = i;
 
                (*i)->visit(*this);
@@ -312,7 +330,6 @@ bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const stri
                iface_var->linked_declaration = &var;
        stage->content.body.insert(iface_insert_point, iface_var);
        {
-               SetForScope<unsigned> set_level(scope_level, 1);
                SetForScope<Block *> set_block(current_block, &stage->content);
                iface_var->visit(*this);
        }
@@ -341,6 +358,10 @@ 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->out_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);
@@ -357,7 +378,7 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
 {
        if(var.interface=="out")
        {
-               if(scope_level==1)
+               if(current_block==&stage->content)
                        stage->out_variables[var.name] = &var;
                else if(generate_interface(var, "out", change_prefix(var.name, string())))
                {
@@ -455,7 +476,6 @@ void InterfaceGenerator::visit(Passthrough &pass)
 
 
 DeclarationReorderer::DeclarationReorderer():
-       scope_level(0),
        kind(NO_DECLARATION)
 { }
 
@@ -470,8 +490,7 @@ void DeclarationReorderer::visit(FunctionCall &call)
 
 void DeclarationReorderer::visit(Block &block)
 {
-       SetForScope<unsigned> set(scope_level, scope_level+1);
-       if(scope_level>1)
+       if(block.parent)
                return TraversingVisitor::visit(block);
 
        NodeList<Statement>::iterator struct_insert_point = block.body.end();