]> git.tdb.fi Git - libs/gl.git/blobdiff - source/programcompiler.cpp
Fix formatting issues with else ifs
[libs/gl.git] / source / programcompiler.cpp
index f7d231615618178cecbcaf68ecf49caa2ae5835b..2428ab796e4756ea171cd026d2954a49b505c35b 100644 (file)
@@ -8,6 +8,26 @@
 
 using namespace std;
 
+namespace {
+
+const char builtins_src[] =
+       "////// vertex\n"
+       "out gl_PerVertex {\n"
+       "  vec4 gl_Position;\n"
+       "  float gl_ClipDistance[];\n"
+       "};"
+       "////// geometry\n"
+       "in gl_PerVertex {\n"
+       "  vec4 gl_Position;\n"
+       "  float gl_ClipDistance[];\n"
+       "} gl_in[];\n"
+       "out gl_PerVertex {\n"
+       "  vec4 gl_Position;\n"
+       "  float gl_ClipDistance[];\n"
+       "};\n";
+
+}
+
 namespace Msp {
 namespace GL {
 
@@ -51,6 +71,35 @@ void ProgramCompiler::add_shaders(Program &program)
        program.bind_attribute(TEXCOORD4, "texcoord");
 }
 
+Module *ProgramCompiler::create_builtins_module()
+{
+       ProgramParser parser;
+       Module *module = new Module(parser.parse(builtins_src));
+       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+       {
+               VariableResolver resolver;
+               i->content.visit(resolver);
+               for(map<string, VariableDeclaration *>::iterator j=i->content.variables.begin(); j!=i->content.variables.end(); ++j)
+                       j->second->linked_declaration = j->second;
+       }
+       return module;
+}
+
+Module &ProgramCompiler::get_builtins_module()
+{
+       static RefPtr<Module> builtins_module = create_builtins_module();
+       return *builtins_module;
+}
+
+Stage *ProgramCompiler::get_builtins(StageType type)
+{
+       Module &module = get_builtins_module();
+       for(list<Stage>::iterator i=module.stages.begin(); i!=module.stages.end(); ++i)
+               if(i->type==type)
+                       return &*i;
+       return 0;
+}
+
 void ProgramCompiler::process()
 {
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
@@ -122,7 +171,7 @@ void ProgramCompiler::Visitor::apply(Stage &s)
 ProgramCompiler::Formatter::Formatter():
        indent(0),
        parameter_list(false),
-       else_if(false)
+       else_if(0)
 { }
 
 void ProgramCompiler::Formatter::visit(Literal &literal)
@@ -160,14 +209,18 @@ void ProgramCompiler::Formatter::visit(UnaryExpression &unary)
 void ProgramCompiler::Formatter::visit(BinaryExpression &binary)
 {
        binary.left->visit(*this);
-       if(binary.assignment)
-               formatted += format(" %s ", binary.oper);
-       else
-               formatted += binary.oper;
+       formatted += binary.oper;
        binary.right->visit(*this);
        formatted += binary.after;
 }
 
+void ProgramCompiler::Formatter::visit(Assignment &assign)
+{
+       assign.left->visit(*this);
+       formatted += format(" %s ", assign.oper);
+       assign.right->visit(*this);
+}
+
 void ProgramCompiler::Formatter::visit(FunctionCall &call)
 {
        formatted += format("%s(", call.name);
@@ -188,31 +241,26 @@ void ProgramCompiler::Formatter::visit(ExpressionStatement &expr)
 
 void ProgramCompiler::Formatter::visit(Block &block)
 {
+       if(else_if)
+               --else_if;
+
+       unsigned brace_indent = indent;
        if(block.use_braces)
-       {
-               if(else_if)
-               {
-                       formatted += '\n';
-                       else_if = false;
-               }
-               formatted += format("%s{\n", string(indent*2, ' '));
-       }
+               formatted += format("%s{\n", string(brace_indent*2, ' '));
 
-       bool change_indent = (!formatted.empty() && !else_if);
-       indent += change_indent;
+       SetForScope<unsigned> set(indent, indent+!formatted.empty());
        string spaces(indent*2, ' ');
        for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
        {
                if(i!=block.body.begin())
                        formatted += '\n';
-               if(!else_if)
-                       formatted += spaces;
+               formatted += spaces;
                (*i)->visit(*this);
+               else_if = 0;
        }
-       indent -= change_indent;
 
        if(block.use_braces)
-               formatted += format("\n%s}", string(indent*2, ' '));
+               formatted += format("\n%s}", string(brace_indent*2, ' '));
 }
 
 void ProgramCompiler::Formatter::visit(Layout &layout)
@@ -242,7 +290,7 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
                formatted += "const ";
        if(!var.sampling.empty())
                formatted += format("%s ", var.sampling);
-       if(!var.interface.empty())
+       if(!var.interface.empty() && var.interface!=block_interface)
                formatted += format("%s ", var.interface);
        formatted += format("%s %s", var.type, var.name);
        if(var.array)
@@ -263,6 +311,7 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
 
 void ProgramCompiler::Formatter::visit(InterfaceBlock &iface)
 {
+       SetForScope<string> set(block_interface, iface.interface);
        formatted += format("%s %s\n", iface.interface, iface.name);
        iface.members.visit(*this);
        formatted += ';';
@@ -291,10 +340,9 @@ void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
 void ProgramCompiler::Formatter::visit(Conditional &cond)
 {
        if(else_if)
-       {
-               formatted += ' ';
-               else_if = false;
-       }
+               formatted.replace(formatted.rfind('\n'), string::npos, 1, ' ');
+
+       indent -= else_if;
 
        formatted += "if(";
        cond.condition->visit(*this);
@@ -303,8 +351,8 @@ void ProgramCompiler::Formatter::visit(Conditional &cond)
        cond.body.visit(*this);
        if(!cond.else_body.body.empty())
        {
-               formatted += format("\n%selse", string(indent*2, ' '));
-               SetFlag set(else_if);
+               formatted += format("\n%selse\n", string(indent*2, ' '));
+               SetForScope<unsigned> set(else_if, 2);
                cond.else_body.visit(*this);
        }
 }
@@ -330,9 +378,23 @@ void ProgramCompiler::Formatter::visit(Return &ret)
 
 
 ProgramCompiler::VariableResolver::VariableResolver():
-       anonymous(false)
+       anonymous(false),
+       record_target(false),
+       assignment_target(0),
+       self_referencing(false)
 { }
 
+void ProgramCompiler::VariableResolver::apply(Stage &s)
+{
+       SetForScope<Stage *> set(stage, &s);
+       Stage *builtins = get_builtins(stage->type);
+       if(builtins)
+               blocks.push_back(&builtins->content);
+       stage->content.visit(*this);
+       if(builtins)
+               blocks.pop_back();
+}
+
 void ProgramCompiler::VariableResolver::visit(Block &block)
 {
        blocks.push_back(&block);
@@ -356,6 +418,19 @@ void ProgramCompiler::VariableResolver::visit(VariableReference &var)
                        break;
                }
        }
+
+       if(record_target)
+       {
+               if(assignment_target)
+               {
+                       record_target = false;
+                       assignment_target = 0;
+               }
+               else
+                       assignment_target = var.declaration;
+       }
+       else if(var.declaration && var.declaration==assignment_target)
+               self_referencing = true;
 }
 
 void ProgramCompiler::VariableResolver::visit(MemberAccess &memacc)
@@ -380,7 +455,10 @@ void ProgramCompiler::VariableResolver::visit(BinaryExpression &binary)
 {
        if(binary.oper=="[")
        {
-               binary.right->visit(*this);
+               {
+                       SetForScope<bool> set(record_target, false);
+                       binary.right->visit(*this);
+               }
                type = 0;
                binary.left->visit(*this);
        }
@@ -391,6 +469,21 @@ void ProgramCompiler::VariableResolver::visit(BinaryExpression &binary)
        }
 }
 
+void ProgramCompiler::VariableResolver::visit(Assignment &assign)
+{
+       {
+               SetFlag set(record_target);
+               assignment_target = 0;
+               assign.left->visit(*this);
+       }
+
+       self_referencing = false;
+       assign.right->visit(*this);
+
+       assign.self_referencing = (self_referencing || assign.oper!="=");
+       assign.target_declaration = assignment_target;
+}
+
 void ProgramCompiler::VariableResolver::visit(StructDeclaration &strct)
 {
        TraversingVisitor::visit(strct);
@@ -407,6 +500,9 @@ void ProgramCompiler::VariableResolver::visit(VariableDeclaration &var)
                        var.type_declaration = j->second;
        }
 
+       if(!block_interface.empty() && var.interface.empty())
+               var.interface = block_interface;
+
        TraversingVisitor::visit(var);
        blocks.back()->variables[var.name] = &var;
        if(anonymous && blocks.size()>1)
@@ -416,6 +512,7 @@ void ProgramCompiler::VariableResolver::visit(VariableDeclaration &var)
 void ProgramCompiler::VariableResolver::visit(InterfaceBlock &iface)
 {
        SetFlag set(anonymous);
+       SetForScope<string> set2(block_interface, iface.interface);
        TraversingVisitor::visit(iface);
 }
 
@@ -491,8 +588,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;
@@ -502,13 +603,12 @@ bool ProgramCompiler::InterfaceGenerator::generate_interface(VariableDeclaration
 
 void ProgramCompiler::InterfaceGenerator::insert_assignment(const string &left, ProgramSyntax::Expression *right)
 {
-       BinaryExpression *assign = new BinaryExpression;
+       Assignment *assign = new Assignment;
        VariableReference *ref = new VariableReference;
        ref->name = left;
        assign->left = ref;
        assign->oper = "=";
        assign->right = right;
-       assign->assignment = true;
 
        ExpressionStatement *stmt = new ExpressionStatement;
        stmt->expression = assign;
@@ -587,6 +687,24 @@ void ProgramCompiler::InterfaceGenerator::visit(Passthrough &pass)
                }
        }
 
+       if(stage->type==GEOMETRY)
+       {
+               VariableReference *ref = new VariableReference;
+               ref->name = "gl_in";
+
+               BinaryExpression *subscript = new BinaryExpression;
+               subscript->left = ref;
+               subscript->oper = "[";
+               subscript->right = pass.subscript;
+               subscript->after = "]";
+
+               MemberAccess *memacc = new MemberAccess;
+               memacc->left = subscript;
+               memacc->member = "gl_Position";
+
+               insert_assignment("gl_Position", memacc);
+       }
+
        for(vector<VariableDeclaration *>::const_iterator i=pass_vars.begin(); i!=pass_vars.end(); ++i)
        {
                string out_name = change_prefix((*i)->name, out_prefix);
@@ -627,40 +745,40 @@ void ProgramCompiler::VariableRenamer::visit(VariableDeclaration &var)
 
 ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
        aggregate(0),
-       assignment(false),
-       record_target(false),
-       assignment_target(0),
-       indeterminate_target(false),
-       self_referencing(false)
+       assignment(0),
+       assignment_target(false)
 { }
 
-void ProgramCompiler::UnusedVariableLocator::visit(VariableReference &var)
+void ProgramCompiler::UnusedVariableLocator::apply(Stage &s)
 {
-       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);
-               }
+       assignments.push_back(BlockAssignmentMap());
+       Visitor::apply(s);
+       assignments.pop_back();
+}
 
-               if(assignment && var.declaration==assignment_target)
-                       self_referencing = true;
-       }
+void ProgramCompiler::UnusedVariableLocator::visit(VariableReference &var)
+{
+       unused_nodes.erase(var.declaration);
 
        map<VariableDeclaration *, Node *>::iterator i = aggregates.find(var.declaration);
        if(i!=aggregates.end())
                unused_nodes.erase(i->second);
+
+       if(assignment_target)
+               return;
+
+       for(vector<BlockAssignmentMap>::iterator j=assignments.end(); j!=assignments.begin(); )
+       {
+               --j;
+               BlockAssignmentMap::iterator k = j->find(var.declaration);
+               if(k!=j->end())
+               {
+                       for(vector<Node *>::iterator l=k->second.nodes.begin(); l!=k->second.nodes.end(); ++l)
+                               unused_nodes.erase(*l);
+                       j->erase(k);
+                       break;
+               }
+       }
 }
 
 void ProgramCompiler::UnusedVariableLocator::visit(MemberAccess &memacc)
@@ -671,48 +789,44 @@ void ProgramCompiler::UnusedVariableLocator::visit(MemberAccess &memacc)
 
 void ProgramCompiler::UnusedVariableLocator::visit(BinaryExpression &binary)
 {
-       if(binary.assignment)
-       {
-               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=="[")
+       if(binary.oper=="[")
        {
                binary.left->visit(*this);
-               SetForScope<bool> set(record_target, false);
+               SetForScope<bool> set(assignment_target, false);
                binary.right->visit(*this);
        }
        else
                TraversingVisitor::visit(binary);
 }
 
+void ProgramCompiler::UnusedVariableLocator::visit(Assignment &assign)
+{
+       {
+               SetForScope<bool> set(assignment_target, !assign.self_referencing);
+               assign.left->visit(*this);
+       }
+       assign.right->visit(*this);
+       assignment = &assign;
+}
+
+void ProgramCompiler::UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool self_ref)
+{
+       unused_nodes.insert(&node);
+       BlockAssignmentMap &block_assignments = assignments.back();
+       AssignmentList &var_assignments = block_assignments[&var];
+       if(!self_ref)
+               var_assignments.nodes.clear();
+       var_assignments.nodes.push_back(&node);
+       var_assignments.conditional = false;
+       var_assignments.self_referencing = self_ref;
+}
+
 void ProgramCompiler::UnusedVariableLocator::visit(ExpressionStatement &expr)
 {
-       assignment = false;
-       assignment_target = 0;
-       indeterminate_target = false;
-       self_referencing = false;
+       assignment = 0;
        TraversingVisitor::visit(expr);
-       if(assignment && assignment_target && !indeterminate_target)
-       {
-               Node *&assign = assignments[assignment_target];
-               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.erase(assignment_target);
-               else
-                       unused_nodes.insert(&expr);
-       }
-       assignment = false;
+       if(assignment && assignment->target_declaration)
+               record_assignment(*assignment->target_declaration, expr, assignment->self_referencing);
 }
 
 void ProgramCompiler::UnusedVariableLocator::visit(StructDeclaration &strct)
@@ -730,10 +844,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(VariableDeclaration &var)
        {
                unused_nodes.insert(&var);
                if(var.init_expression)
-               {
-                       unused_nodes.insert(&*var.init_expression);
-                       assignments[&var] = &*var.init_expression;
-               }
+                       record_assignment(var, *var.init_expression, false);
        }
        unused_nodes.erase(var.type_declaration);
        TraversingVisitor::visit(var);
@@ -746,6 +857,91 @@ void ProgramCompiler::UnusedVariableLocator::visit(InterfaceBlock &iface)
        TraversingVisitor::visit(iface);
 }
 
+void ProgramCompiler::UnusedVariableLocator::visit(FunctionDeclaration &func)
+{
+       assignments.push_back(BlockAssignmentMap());
+
+       for(vector<NodePtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+               (*i)->visit(*this);
+       func.body.visit(*this);
+
+       BlockAssignmentMap &block_assignments = assignments.back();
+       for(map<string, VariableDeclaration *>::iterator i=func.body.variables.begin(); i!=func.body.variables.end(); ++i)
+               block_assignments.erase(i->second);
+       for(BlockAssignmentMap::iterator i=block_assignments.begin(); i!=block_assignments.end(); ++i)
+       {
+               if(i->first->interface=="out" && stage->type!=FRAGMENT && !i->first->linked_declaration)
+                       continue;
+
+               for(vector<Node *>::iterator j=i->second.nodes.begin(); j!=i->second.nodes.end(); ++j)
+                       unused_nodes.erase(*j);
+       }
+
+       assignments.pop_back();
+}
+
+void ProgramCompiler::UnusedVariableLocator::merge_down_assignments()
+{
+       BlockAssignmentMap &parent_assignments = assignments[assignments.size()-2];
+       BlockAssignmentMap &block_assignments = assignments.back();
+       for(BlockAssignmentMap::iterator i=block_assignments.begin(); i!=block_assignments.end(); ++i)
+       {
+               BlockAssignmentMap::iterator j = parent_assignments.find(i->first);
+               if(j==parent_assignments.end())
+                       parent_assignments.insert(*i);
+               else if(i->second.self_referencing || i->second.conditional)
+               {
+                       j->second.nodes.insert(j->second.nodes.end(), i->second.nodes.begin(), i->second.nodes.end());
+                       j->second.conditional |= i->second.conditional;
+                       j->second.self_referencing |= i->second.self_referencing;
+               }
+               else
+                       j->second = i->second;
+       }
+       assignments.pop_back();
+}
+
+void ProgramCompiler::UnusedVariableLocator::visit(Conditional &cond)
+{
+       cond.condition->visit(*this);
+       assignments.push_back(BlockAssignmentMap());
+       cond.body.visit(*this);
+
+       BlockAssignmentMap if_assignments;
+       swap(assignments.back(), if_assignments);
+       cond.else_body.visit(*this);
+
+       BlockAssignmentMap &else_assignments = assignments.back();
+       for(BlockAssignmentMap::iterator i=else_assignments.begin(); i!=else_assignments.end(); ++i)
+       {
+               BlockAssignmentMap::iterator j = if_assignments.find(i->first);
+               if(j!=if_assignments.end())
+               {
+                       i->second.nodes.insert(i->second.nodes.end(), j->second.nodes.begin(), j->second.nodes.end());
+                       i->second.conditional |= j->second.conditional;
+                       i->second.self_referencing |= j->second.self_referencing;
+                       if_assignments.erase(j);
+               }
+               else
+                       i->second.conditional = true;
+       }
+
+       for(BlockAssignmentMap::iterator i=if_assignments.begin(); i!=if_assignments.end(); ++i)
+       {
+               i->second.conditional = true;
+               else_assignments.insert(*i);
+       }
+
+       merge_down_assignments();
+}
+
+void ProgramCompiler::UnusedVariableLocator::visit(Iteration &iter)
+{
+       assignments.push_back(BlockAssignmentMap());
+       TraversingVisitor::visit(iter);
+       merge_down_assignments();
+}
+
 
 void ProgramCompiler::NodeRemover::visit(Block &block)
 {