Fix passthroughs being generated for non-output variables

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

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 842ca4f6cdd5ab1f68bb47b3bb657490b9bb9d6a..9adfb93d5cbfab11984c6bcf5f5a6a8315f6d494 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -116,10 +116,10 @@ void BlockHierarchyResolver::enter(Block &block)
 
 VariableResolver::VariableResolver():
        stage(0),
-       members(0),
+       r_members(0),
        record_target(false),
-       assignment_target(0),
-       self_referencing(false)
+       r_assignment_target(0),
+       r_self_referencing(false)
 { }
 
 void VariableResolver::apply(Stage &s)
@@ -138,7 +138,7 @@ void VariableResolver::enter(Block &block)
 void VariableResolver::visit(VariableReference &var)
 {
        var.declaration = 0;
-       members = 0;
+       r_members = 0;
        for(Block *block=current_block; (!var.declaration && block); block=block->parent)
        {
                map<string, VariableDeclaration *>::iterator i = block->variables.find(var.name);
@@ -149,7 +149,7 @@ void VariableResolver::visit(VariableReference &var)
        if(var.declaration)
        {
                if(var.declaration->type_declaration)
-                       members = &var.declaration->type_declaration->members.variables;
+                       r_members = &var.declaration->type_declaration->members.variables;
        }
        else
        {
@@ -157,10 +157,10 @@ void VariableResolver::visit(VariableReference &var)
                map<string, InterfaceBlock *>::const_iterator i = blocks.find(var.name);
                if(i!=blocks.end() && i->second->instance_name==var.name)
                {
-                       iface_ref = new InterfaceBlockReference;
-                       iface_ref->name = var.name;
-                       iface_ref->declaration = i->second;
-                       members = &i->second->members.variables;
+                       r_iface_ref = new InterfaceBlockReference;
+                       r_iface_ref->name = var.name;
+                       r_iface_ref->declaration = i->second;
+                       r_members = &i->second->members.variables;
                }
                else
                {
@@ -176,16 +176,16 @@ void VariableResolver::visit(VariableReference &var)
 
        if(record_target)
        {
-               if(assignment_target)
+               if(r_assignment_target)
                {
                        record_target = false;
-                       assignment_target = 0;
+                       r_assignment_target = 0;
                }
                else
-                       assignment_target = var.declaration;
+                       r_assignment_target = var.declaration;
        }
-       else if(var.declaration && var.declaration==assignment_target)
-               self_referencing = true;
+       else if(var.declaration && var.declaration==r_assignment_target)
+               r_self_referencing = true;
 }
 
 void VariableResolver::visit(InterfaceBlockReference &iface)
@@ -197,7 +197,7 @@ void VariableResolver::visit(InterfaceBlockReference &iface)
                if(i!=stage->interface_blocks.end())
                {
                        iface.declaration = i->second;
-                       members = &i->second->members.variables;
+                       r_members = &i->second->members.variables;
                        break;
                }
        }
@@ -205,48 +205,48 @@ void VariableResolver::visit(InterfaceBlockReference &iface)
 
 void VariableResolver::visit(MemberAccess &memacc)
 {
-       members = 0;
-       iface_ref = 0;
+       r_members = 0;
+       r_iface_ref = 0;
        memacc.left->visit(*this);
 
-       if(iface_ref)
-               memacc.left = iface_ref;
-       iface_ref = 0;
+       if(r_iface_ref)
+               memacc.left = r_iface_ref;
+       r_iface_ref = 0;
 
        memacc.declaration = 0;
-       if(members)
+       if(r_members)
        {
-               map<string, VariableDeclaration *>::iterator i = members->find(memacc.member);
-               if(i!=members->end())
+               map<string, VariableDeclaration *>::iterator i = r_members->find(memacc.member);
+               if(i!=r_members->end())
                {
                        memacc.declaration = i->second;
                        if(i->second->type_declaration)
-                               members = &i->second->type_declaration->members.variables;
+                               r_members = &i->second->type_declaration->members.variables;
                }
                else
-                       members = 0;
+                       r_members = 0;
        }
 }
 
 void VariableResolver::visit(BinaryExpression &binary)
 {
-       if(binary.oper=="[")
+       if(binary.oper->token[0]=='[')
        {
                {
                        SetForScope<bool> set(record_target, false);
                        binary.right->visit(*this);
                }
-               members = 0;
-               iface_ref = 0;
+               r_members = 0;
+               r_iface_ref = 0;
                binary.left->visit(*this);
-               if(iface_ref)
-                       binary.left = iface_ref;
-               iface_ref = 0;
+               if(r_iface_ref)
+                       binary.left = r_iface_ref;
+               r_iface_ref = 0;
        }
        else
        {
                TraversingVisitor::visit(binary);
-               members = 0;
+               r_members = 0;
        }
 }
 
@@ -254,15 +254,15 @@ void VariableResolver::visit(Assignment &assign)
 {
        {
                SetFlag set(record_target);
-               assignment_target = 0;
+               r_assignment_target = 0;
                assign.left->visit(*this);
        }
 
-       self_referencing = false;
+       r_self_referencing = false;
        assign.right->visit(*this);
 
-       assign.self_referencing = (self_referencing || assign.oper!="=");
-       assign.target_declaration = assignment_target;
+       assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='=');
+       assign.target_declaration = r_assignment_target;
 }
 
 void VariableResolver::visit(StructDeclaration &strct)
@@ -460,7 +460,7 @@ ExpressionStatement &InterfaceGenerator::insert_assignment(const string &left, E
        VariableReference *ref = new VariableReference;
        ref->name = left;
        assign->left = ref;
-       assign->oper = "=";
+       assign->oper = &Operator::get_operator("=", Operator::BINARY);
        assign->right = right;
 
        ExpressionStatement *stmt = new ExpressionStatement;
@@ -606,11 +606,10 @@ void InterfaceGenerator::visit(Passthrough &pass)
                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)
-                               linked = ((*j)->linked_declaration==i->second);
+                       if(i->second->interface!="out")
+                               continue;
 
-                       if(!linked && generate_interface(*i->second, "in", i->second->name))
+                       if(!i->second->linked_declaration && generate_interface(*i->second, "in", i->second->name))
                                pass_vars.push_back(i->second);
                }
        }
@@ -622,9 +621,8 @@ void InterfaceGenerator::visit(Passthrough &pass)
 
                BinaryExpression *subscript = new BinaryExpression;
                subscript->left = ref;
-               subscript->oper = "[";
+               subscript->oper = &Operator::get_operator("[", Operator::BINARY);
                subscript->right = pass.subscript;
-               subscript->after = "]";
 
                MemberAccess *memacc = new MemberAccess;
                memacc->left = subscript;
@@ -644,9 +642,8 @@ void InterfaceGenerator::visit(Passthrough &pass)
                {
                        BinaryExpression *subscript = new BinaryExpression;
                        subscript->left = ref;
-                       subscript->oper = "[";
+                       subscript->oper = &Operator::get_operator("[", Operator::BINARY);
                        subscript->right = pass.subscript;
-                       subscript->after = "]";
                        insert_assignment(out_name, subscript);
                }
                else