X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.cpp;h=bcd6051a7c4a65b13604a5e75ec63eeed9c8de7b;hp=717acad1fdf6dbbd0f03e4e4a9a64ce3f2a4bcd2;hb=HEAD;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp index 717acad1..bcd6051a 100644 --- a/source/glsl/visitor.cpp +++ b/source/glsl/visitor.cpp @@ -7,48 +7,63 @@ namespace Msp { namespace GL { namespace SL { -void NodeVisitor::visit(Assignment &assign) +void TraversingVisitor::visit(Block &block) { - visit(static_cast(assign)); + if(&block!=current_block) + enter(block); + SetForScope set_block(current_block, &block); + for(const RefPtr &s: block.body) + s->visit(*this); } - -void TraversingVisitor::visit(Block &block) +void TraversingVisitor::visit(RefPtr &expr) { - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ++i) - (*i)->visit(*this); + expr->visit(*this); } -void TraversingVisitor::visit(ParenthesizedExpression &parexpr) +void TraversingVisitor::visit(MemberAccess &memacc) { - parexpr.expression->visit(*this); + visit(memacc.left); } -void TraversingVisitor::visit(MemberAccess &memacc) +void TraversingVisitor::visit(Swizzle &swizzle) { - memacc.left->visit(*this); + visit(swizzle.left); } void TraversingVisitor::visit(UnaryExpression &unary) { - unary.expression->visit(*this); + visit(unary.expression); } void TraversingVisitor::visit(BinaryExpression &binary) { - binary.left->visit(*this); - binary.right->visit(*this); + visit(binary.left); + visit(binary.right); +} + +void TraversingVisitor::visit(Assignment &assign) +{ + visit(assign.left); + visit(assign.right); +} + +void TraversingVisitor::visit(TernaryExpression &ternary) +{ + visit(ternary.condition); + visit(ternary.true_expr); + visit(ternary.false_expr); } void TraversingVisitor::visit(FunctionCall &call) { - for(NodeArray::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i) - (*i)->visit(*this); + for(RefPtr &a: call.arguments) + visit(a); } void TraversingVisitor::visit(ExpressionStatement &expr) { - expr.expression->visit(*this); + visit(expr.expression); } void TraversingVisitor::visit(InterfaceLayout &layout) @@ -66,130 +81,164 @@ void TraversingVisitor::visit(VariableDeclaration &var) if(var.layout) var.layout->visit(*this); if(var.init_expression) - var.init_expression->visit(*this); + visit(var.init_expression); if(var.array_size) - var.array_size->visit(*this); -} - -void TraversingVisitor::visit(InterfaceBlock &iface) -{ - iface.members.visit(*this); + visit(var.array_size); } void TraversingVisitor::visit(FunctionDeclaration &func) { - for(NodeArray::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i) - (*i)->visit(*this); + enter(func.body); + SetForScope set_block(current_block, &func.body); + for(const RefPtr &p: func.parameters) + p->visit(*this); func.body.visit(*this); } void TraversingVisitor::visit(Conditional &cond) { - cond.condition->visit(*this); + visit(cond.condition); cond.body.visit(*this); cond.else_body.visit(*this); } void TraversingVisitor::visit(Iteration &iter) { + enter(iter.body); + SetForScope set_block(current_block, &iter.body); if(iter.init_statement) iter.init_statement->visit(*this); if(iter.condition) - iter.condition->visit(*this); - if(iter.loop_expression) - iter.loop_expression->visit(*this); + visit(iter.condition); iter.body.visit(*this); + if(iter.loop_expression) + visit(iter.loop_expression); } void TraversingVisitor::visit(Passthrough &pass) { if(pass.subscript) - pass.subscript->visit(*this); + visit(pass.subscript); } void TraversingVisitor::visit(Return &ret) { if(ret.expression) - ret.expression->visit(*this); + visit(ret.expression); } -BlockModifier::BlockModifier(): - remove_node(false) -{ } - -void BlockModifier::flatten_block(Block &block) +void NodeRemover::apply(Stage &s, const set &tr) { - insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end()); - remove_node = true; + stage = &s; + to_remove = &tr; + s.content.visit(*this); } -void BlockModifier::apply_and_increment(Block &block, NodeList::iterator &i) +template +void NodeRemover::remove_from_map(map &vars, const string &key, T &node) { - block.body.insert(i, insert_nodes.begin(), insert_nodes.end()); - insert_nodes.clear(); - - if(remove_node) - block.body.erase(i++); - else - ++i; - remove_node = false; + auto i = vars.find(key); + if(i!=vars.end() && i->second==&node) + vars.erase(i); } -void BlockModifier::visit(Block &block) +void NodeRemover::visit(Block &block) { - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ) + SetForScope set_block(current_block, &block); + for(auto i=block.body.begin(); i!=block.body.end(); ) { (*i)->visit(*this); - apply_and_increment(block, i); + if(to_remove->count(i->get())) + block.body.erase(i++); + else + ++i; } } - -NodeRemover::NodeRemover(const set &r): - stage(0), - to_remove(r) -{ } - -void NodeRemover::apply(Stage &s) +void NodeRemover::visit(TypeDeclaration &type) { - SetForScope set_stage(stage, &s); - visit(s.content); + if(to_remove->count(&type)) + remove_from_map(stage->types, type.name, type); } -void NodeRemover::visit(Block &block) +void NodeRemover::visit(StructDeclaration &strct) { - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ) + if(to_remove->count(&strct)) { - (*i)->visit(*this); - if(to_remove.count(i->get())) - block.body.erase(i++); - else - ++i; + remove_from_map(stage->types, strct.name, strct); + if(strct.block_declaration) + { + string key = format("%s %s", strct.block_declaration->interface, strct.block_name); + remove_from_map(stage->interface_blocks, key, *strct.block_declaration); + remove_from_map(stage->interface_blocks, strct.block_declaration->name, *strct.block_declaration); + strct.block_declaration->block_declaration = 0; + } } } void NodeRemover::visit(VariableDeclaration &var) { - if(to_remove.count(&var)) + if(to_remove->count(&var)) { - stage->in_variables.erase(var.name); - stage->out_variables.erase(var.name); + remove_from_map(current_block->variables, var.name, var); + if(var.block_declaration) + { + remove_from_map(stage->interface_blocks, format("%s %s", var.interface, var.block_declaration->block_name), var); + remove_from_map(stage->interface_blocks, var.name, var); + var.block_declaration->block_declaration = 0; + } stage->locations.erase(var.name); if(var.linked_declaration) var.linked_declaration->linked_declaration = 0; } - else if(var.init_expression && to_remove.count(var.init_expression.get())) + else if(var.init_expression && to_remove->count(var.init_expression.get())) var.init_expression = 0; } +void NodeRemover::visit(FunctionDeclaration &func) +{ + if(to_remove->count(&func)) + { + remove_from_map(stage->functions, func.name, func); + if(!func.signature.empty()) + remove_from_map(stage->functions, func.name+func.signature, func); + } + TraversingVisitor::visit(func); +} + void NodeRemover::visit(Iteration &iter) { - if(to_remove.count(iter.init_statement.get())) + if(to_remove->count(iter.init_statement.get())) iter.init_statement = 0; TraversingVisitor::visit(iter); } + +void NodeReorderer::apply(Stage &stage, Node &before, const set &tr) +{ + reorder_before = &before; + to_reorder = &tr; + stage.content.visit(*this); +} + +void NodeReorderer::visit(Block &block) +{ + auto insert_point = block.body.end(); + for(auto i=block.body.begin(); i!=block.body.end(); ) + { + (*i)->visit(*this); + if(insert_point!=block.body.end() && to_reorder->count(i->get())) + block.body.splice(insert_point, block.body, i++); + else + { + if(i->get()==reorder_before) + insert_point = i; + ++i; + } + } +} + } // namespace SL } // namespace GL } // namespace Msp