Add a missing symmetry to linking variables

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

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 02021a4c39993c999f544c8718ea40292a4b0806..b91c2e2614ef2d577ce1e501893222eed678507d 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -157,8 +157,8 @@ void VariableResolver::visit(VariableReference &var)
        else
        {
                const map<string, InterfaceBlock *> &blocks = stage->interface_blocks;
-               map<string, InterfaceBlock *>::const_iterator i = blocks.find(var.name);
-               if(i!=blocks.end() && i->second->instance_name==var.name)
+               map<string, InterfaceBlock *>::const_iterator i = blocks.find("_"+var.name);
+               if(i!=blocks.end())
                {
                        /* The name refers to an interface block with an instance name rather
                        than a variable.  Prepare a new syntax tree node accordingly. */
@@ -201,7 +201,7 @@ void VariableResolver::visit(InterfaceBlockReference &iface)
        iface.declaration = 0;
        for(Block *block=current_block; block; block=block->parent)
        {
-               map<string, InterfaceBlock *>::iterator i = stage->interface_blocks.find(iface.name);
+               map<string, InterfaceBlock *>::iterator i = stage->interface_blocks.find("_"+iface.name);
                if(i!=stage->interface_blocks.end())
                {
                        iface.declaration = i->second;
@@ -295,7 +295,7 @@ void VariableResolver::visit(FunctionCall &call)
 void VariableResolver::visit(StructDeclaration &strct)
 {
        TraversingVisitor::visit(strct);
-       stage->types[strct.name] = &strct;
+       stage->types.insert(make_pair(strct.name, &strct));
 }
 
 void VariableResolver::visit(VariableDeclaration &var)
@@ -308,16 +308,16 @@ void VariableResolver::visit(VariableDeclaration &var)
                var.interface = block_interface;
 
        TraversingVisitor::visit(var);
-       current_block->variables[var.name] = &var;
+       current_block->variables.insert(make_pair(var.name, &var));
 }
 
 void VariableResolver::visit(InterfaceBlock &iface)
 {
-       /* Block names can't be used for any other identifiers so we can put them
-       in the same map with instance names. */
-       stage->interface_blocks[iface.name] = &iface;
+       /* Block names can be reused in different interfaces.  Prefix the name with
+       the first character of the interface to avoid conflicts. */
+       stage->interface_blocks.insert(make_pair(iface.interface+iface.name, &iface));
        if(!iface.instance_name.empty())
-               stage->interface_blocks[iface.instance_name] = &iface;
+               stage->interface_blocks.insert(make_pair("_"+iface.instance_name, &iface));
 
        SetForScope<string> set_iface(block_interface, iface.interface);
        TraversingVisitor::visit(iface);
@@ -417,10 +417,10 @@ string InterfaceGenerator::change_prefix(const string &name, const string &prefi
        return prefix+name.substr(offset);
 }
 
-bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
+VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
 {
        if(stage->content.variables.count(name))
-               return false;
+               return 0;
 
        VariableDeclaration* iface_var = new VariableDeclaration;
        iface_var->sampling = var.sampling;
@@ -443,15 +443,15 @@ bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const stri
        }
 
        iface_target_block->body.insert(iface_insert_point, iface_var);
-       iface_target_block->variables[name] = iface_var;
+       iface_target_block->variables.insert(make_pair(name, iface_var));
 
-       return true;
+       return iface_var;
 }
 
-bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
+InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
 {
-       if(stage->interface_blocks.count(out_block.name))
-               return false;
+       if(stage->interface_blocks.count("in"+out_block.name))
+               return 0;
 
        InterfaceBlock *in_block = new InterfaceBlock;
        in_block->interface = "in";
@@ -472,15 +472,15 @@ bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
        }
 
        iface_target_block->body.insert(iface_insert_point, in_block);
-       stage->interface_blocks[in_block->name] = in_block;
+       stage->interface_blocks.insert(make_pair("in"+in_block->name, in_block));
        if(!in_block->instance_name.empty())
-               stage->interface_blocks[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);
        in_block->visit(*this);
 
-       return true;
+       return in_block;
 }
 
 ExpressionStatement &InterfaceGenerator::insert_assignment(const string &left, Expression *right)
@@ -521,10 +521,12 @@ 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);
-       if(j!=prev_blocks.end() && j->second->interface=="out" && j->second->instance_name==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);
+               /* Let VariableResolver convert the variable reference into an interface
+               block reference. */
                return;
        }
 
@@ -556,7 +558,10 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
                        const map<string, VariableDeclaration *> &linked_vars = iface_block->linked_block->members.variables;
                        map<string, VariableDeclaration *>::const_iterator i = linked_vars.find(var.name);
                        if(i!=linked_vars.end())
+                       {
                                var.linked_declaration = i->second;
+                               var.linked_declaration->linked_declaration = &var;
+                       }
                }
                return;
        }
@@ -565,8 +570,11 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
        {
                /* For output 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))
+               VariableDeclaration *out_var = 0;
+               if(function_scope && (out_var=generate_interface(var, "out", var.name)))
                {
+                       out_var->source = var.source;
+                       out_var->line = var.line;
                        nodes_to_remove.insert(&var);
                        if(var.init_expression)
                        {
@@ -605,8 +613,8 @@ 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(iface.name);
-                       if(i!=prev_blocks.end() && i->second->interface=="out" && i->second->name==iface.name)
+                       map<string, InterfaceBlock *>::const_iterator i = prev_blocks.find("out"+iface.name);
+                       if(i!=prev_blocks.end())
                        {
                                iface.linked_block = i->second;
                                i->second->linked_block = &iface;