X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.cpp;h=bcd6051a7c4a65b13604a5e75ec63eeed9c8de7b;hp=265b11d41215da3bae6cebdbfcaa1b92e0919f24;hb=HEAD;hpb=99719790df8a1215465a68c7b1d87a495bff87eb diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp index 265b11d4..bcd6051a 100644 --- a/source/glsl/visitor.cpp +++ b/source/glsl/visitor.cpp @@ -7,49 +7,63 @@ namespace Msp { namespace GL { namespace SL { -void NodeVisitor::visit(Assignment &assign) -{ - visit(static_cast(assign)); -} - - void TraversingVisitor::visit(Block &block) { + if(&block!=current_block) + enter(block); SetForScope set_block(current_block, &block); - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ++i) - (*i)->visit(*this); + for(const RefPtr &s: block.body) + s->visit(*this); } -void TraversingVisitor::visit(ParenthesizedExpression &parexpr) +void TraversingVisitor::visit(RefPtr &expr) { - parexpr.expression->visit(*this); + expr->visit(*this); } void TraversingVisitor::visit(MemberAccess &memacc) { - memacc.left->visit(*this); + visit(memacc.left); +} + +void TraversingVisitor::visit(Swizzle &swizzle) +{ + 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) @@ -67,79 +81,72 @@ 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); } -NodeRemover::NodeRemover(): - stage(0), - to_remove(0), - anonymous(false), - recursive_remove(false) -{ } - void NodeRemover::apply(Stage &s, const set &tr) { stage = &s; to_remove = &tr; - visit(s.content); + s.content.visit(*this); } -void NodeRemover::remove_variable(map &vars, VariableDeclaration &decl) +template +void NodeRemover::remove_from_map(map &vars, const string &key, T &node) { - map::iterator i = vars.find(decl.name); - if(i!=vars.end() && i->second==&decl) + auto i = vars.find(key); + if(i!=vars.end() && i->second==&node) vars.erase(i); } void NodeRemover::visit(Block &block) { - blocks.push_back(&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); if(to_remove->count(i->get())) @@ -147,24 +154,40 @@ void NodeRemover::visit(Block &block) else ++i; } - blocks.pop_back(); +} + +void NodeRemover::visit(TypeDeclaration &type) +{ + if(to_remove->count(&type)) + remove_from_map(stage->types, type.name, type); } void NodeRemover::visit(StructDeclaration &strct) { if(to_remove->count(&strct)) - blocks.back()->types.erase(strct.name); + { + 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(recursive_remove || to_remove->count(&var)) + if(to_remove->count(&var)) { - remove_variable(blocks.back()->variables, var); - if(anonymous && blocks.size()>1) - remove_variable(blocks[blocks.size()-2]->variables, var); - remove_variable(stage->in_variables, var); - remove_variable(stage->out_variables, var); + 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; @@ -173,11 +196,15 @@ void NodeRemover::visit(VariableDeclaration &var) var.init_expression = 0; } -void NodeRemover::visit(InterfaceBlock &iface) +void NodeRemover::visit(FunctionDeclaration &func) { - SetFlag set_anon(anonymous); - SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface)); - TraversingVisitor::visit(iface); + 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) @@ -187,6 +214,31 @@ void NodeRemover::visit(Iteration &iter) 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