Better handling of array flag for generated interfaces

[libs/gl.git] / source / programcompiler.cpp

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 934416c28684f250fa8c37b9d842f5f05c39b7a9..096a5d84927a062904f92e45b28421a554a0c07e 100644 (file)
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -83,7 +83,7 @@ bool ProgramCompiler::optimize(Stage &stage)
        remover.to_remove = unused_locator.unused_nodes;
        remover.apply(stage);
 
-       return remover.n_removed;
+       return !unused_locator.unused_nodes.empty();
 }
 
 void ProgramCompiler::inject_block(Block &target, const Block &source)
@@ -491,8 +491,12 @@ bool ProgramCompiler::InterfaceGenerator::generate_interface(VariableDeclaration
        iface_var->type = var.type;
        iface_var->type_declaration = var.type_declaration;
        iface_var->name = name;
-       iface_var->array = (var.array || (stage->type==GEOMETRY && iface=="in"));
-       iface_var->array_size = var.array_size;
+       if(stage->type==GEOMETRY)
+               iface_var->array = ((var.array && var.interface!="in") || iface=="in");
+       else
+               iface_var->array = var.array;
+       if(iface_var->array)
+               iface_var->array_size = var.array_size;
        if(iface=="in")
                iface_var->linked_declaration = &var;
        iface_declarations[name] = iface_var;
@@ -626,24 +630,41 @@ void ProgramCompiler::VariableRenamer::visit(VariableDeclaration &var)
 
 
 ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
+       aggregate(0),
        assignment(false),
-       assignment_target(0)
+       record_target(false),
+       assignment_target(0),
+       indeterminate_target(false),
+       self_referencing(false)
 { }
 
 void ProgramCompiler::UnusedVariableLocator::visit(VariableReference &var)
 {
-       if(assignment)
-               assignment_target = var.declaration;
+       if(record_target)
+       {
+               if(assignment_target)
+                       indeterminate_target = true;
+               else
+                       assignment_target = var.declaration;
+       }
        else
        {
                unused_nodes.erase(var.declaration);
+
                map<VariableDeclaration *, Node *>::iterator i = assignments.find(var.declaration);
                if(i!=assignments.end())
                {
                        unused_nodes.erase(i->second);
                        assignments.erase(i);
                }
+
+               if(assignment && var.declaration==assignment_target)
+                       self_referencing = true;
        }
+
+       map<VariableDeclaration *, Node *>::iterator i = aggregates.find(var.declaration);
+       if(i!=aggregates.end())
+               unused_nodes.erase(i->second);
 }
 
 void ProgramCompiler::UnusedVariableLocator::visit(MemberAccess &memacc)
@@ -656,9 +677,20 @@ void ProgramCompiler::UnusedVariableLocator::visit(BinaryExpression &binary)
 {
        if(binary.assignment)
        {
-               binary.right->visit(*this);
                assignment = true;
+               {
+                       SetFlag set(record_target);
+                       binary.left->visit(*this);
+               }
+               if(binary.oper!="=")
+                       self_referencing = true;
+               binary.right->visit(*this);
+       }
+       else if(record_target && binary.oper=="[")
+       {
                binary.left->visit(*this);
+               SetForScope<bool> set(record_target, false);
+               binary.right->visit(*this);
        }
        else
                TraversingVisitor::visit(binary);
@@ -668,60 +700,69 @@ void ProgramCompiler::UnusedVariableLocator::visit(ExpressionStatement &expr)
 {
        assignment = false;
        assignment_target = 0;
+       indeterminate_target = false;
+       self_referencing = false;
        TraversingVisitor::visit(expr);
-       if(assignment && assignment_target)
+       if(assignment && assignment_target && !indeterminate_target)
        {
                Node *&assign = assignments[assignment_target];
-               if(assign)
+               if(self_referencing)
+                       unused_nodes.erase(assign);
+               else if(assign)
                        unused_nodes.insert(assign);
                assign = &expr;
-               if(assignment_target->interface!="out" || (stage->type!=FRAGMENT && !assignment_target->linked_declaration))
-                       unused_nodes.insert(&expr);
-               else
+               if(assignment_target->interface=="out" && (stage->type==FRAGMENT || assignment_target->linked_declaration))
                        unused_nodes.erase(assignment_target);
+               else
+                       unused_nodes.insert(&expr);
        }
        assignment = false;
 }
 
+void ProgramCompiler::UnusedVariableLocator::visit(StructDeclaration &strct)
+{
+       SetForScope<Node *> set(aggregate, &strct);
+       unused_nodes.insert(&strct);
+       TraversingVisitor::visit(strct);
+}
+
 void ProgramCompiler::UnusedVariableLocator::visit(VariableDeclaration &var)
 {
-       unused_nodes.insert(&var);
+       if(aggregate)
+               aggregates[&var] = aggregate;
+       else
+       {
+               unused_nodes.insert(&var);
+               if(var.init_expression)
+               {
+                       unused_nodes.insert(&*var.init_expression);
+                       assignments[&var] = &*var.init_expression;
+               }
+       }
+       unused_nodes.erase(var.type_declaration);
        TraversingVisitor::visit(var);
 }
 
+void ProgramCompiler::UnusedVariableLocator::visit(InterfaceBlock &iface)
+{
+       SetForScope<Node *> set(aggregate, &iface);
+       unused_nodes.insert(&iface);
+       TraversingVisitor::visit(iface);
+}
 
-ProgramCompiler::NodeRemover::NodeRemover():
-       n_removed(0),
-       immutable_block(false),
-       remove_block(false)
-{ }
 
 void ProgramCompiler::NodeRemover::visit(Block &block)
 {
-       remove_block = immutable_block;
        for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
        {
-               bool remove = to_remove.count(&**i);
-               if(!remove)
-                       remove_block = false;
                (*i)->visit(*this);
-
-               if(remove ? !immutable_block : remove_block)
-               {
+               if(to_remove.count(&**i))
                        block.body.erase(i++);
-                       ++n_removed;
-               }
                else
                        ++i;
        }
 }
 
-void ProgramCompiler::NodeRemover::visit(StructDeclaration &strct)
-{
-       SetFlag set(immutable_block);
-       TraversingVisitor::visit(strct);
-}
-
 void ProgramCompiler::NodeRemover::visit(VariableDeclaration &var)
 {
        if(to_remove.count(&var))
@@ -731,12 +772,8 @@ void ProgramCompiler::NodeRemover::visit(VariableDeclaration &var)
                if(var.linked_declaration)
                        var.linked_declaration->linked_declaration = 0;
        }
-}
-
-void ProgramCompiler::NodeRemover::visit(InterfaceBlock &iface)
-{
-       SetFlag set(immutable_block);
-       TraversingVisitor::visit(iface);
+       else if(var.init_expression && to_remove.count(&*var.init_expression))
+               var.init_expression = 0;
 }
 
 } // namespace GL