X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=5bb84269f30abe4fcd38198cef0b6a2ae416b2f8;hp=b004b08bee6f533e437f09051ca28d9bfdb22fbb;hb=3c46227c280bc4cd8a4487c648f2f080d5b4f7ea;hpb=afb65a869e1cc6d3afd215bc364db2fbf1374adb diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp index b004b08b..5bb84269 100644 --- a/source/programcompiler.cpp +++ b/source/programcompiler.cpp @@ -13,12 +13,12 @@ using namespace std; namespace { const char builtins_src[] = - "////// vertex\n" + "#pragma MSP stage(vertex)\n" "out gl_PerVertex {\n" " vec4 gl_Position;\n" " float gl_ClipDistance[];\n" - "};" - "////// geometry\n" + "};\n" + "#pragma MSP stage(geometry)\n" "in gl_PerVertex {\n" " vec4 gl_Position;\n" " float gl_ClipDistance[];\n" @@ -35,25 +35,45 @@ namespace GL { using namespace ProgramSyntax; +// XXX For some reason global declarations are emitted for otherwise undeclared local variables + ProgramCompiler::ProgramCompiler(): resources(0), module(0) { } -void ProgramCompiler::compile(const string &source) +ProgramCompiler::~ProgramCompiler() +{ + delete module; +} + +void ProgramCompiler::compile(const string &source, const string &src_name) { resources = 0; - module = &parser.parse(source); + delete module; + module = new Module(); + ProgramParser parser; + imported_names.insert(src_name); + append_module(parser.parse(source, src_name)); process(); } -void ProgramCompiler::compile(IO::Base &io, Resources *res) +void ProgramCompiler::compile(IO::Base &io, Resources *res, const string &src_name) { resources = res; - module = &parser.parse(io); + delete module; + module = new Module(); + ProgramParser parser; + imported_names.insert(src_name); + append_module(parser.parse(io, src_name)); process(); } +void ProgramCompiler::compile(IO::Base &io, const string &src_name) +{ + compile(io, 0, src_name); +} + void ProgramCompiler::add_shaders(Program &program) { if(!module) @@ -84,7 +104,7 @@ void ProgramCompiler::add_shaders(Program &program) Module *ProgramCompiler::create_builtins_module() { ProgramParser parser; - Module *module = new Module(parser.parse(builtins_src)); + Module *module = new Module(parser.parse(builtins_src, "")); for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) { VariableResolver resolver; @@ -110,13 +130,47 @@ Stage *ProgramCompiler::get_builtins(StageType type) return 0; } -void ProgramCompiler::process() +void ProgramCompiler::append_module(ProgramSyntax::Module &mod) +{ + vector imports = apply >(mod.shared); + for(vector::iterator i=imports.begin(); i!=imports.end(); ++i) + import((*i)->module); + apply(mod.shared, set(imports.begin(), imports.end())); + + append_stage(mod.shared); + for(list::iterator i=mod.stages.begin(); i!=mod.stages.end(); ++i) + append_stage(*i); +} + +void ProgramCompiler::append_stage(Stage &stage) { - list imports = apply >(module->shared); - for(list::iterator i=imports.end(); i!=imports.begin(); ) - import((*--i)->module); - apply(module->shared, set(imports.begin(), imports.end())); + Stage *target = 0; + if(stage.type==SHARED) + target = &module->shared; + else + { + list::iterator i; + for(i=module->stages.begin(); (i!=module->stages.end() && i->typestages.end() || i->type>stage.type) + { + list::iterator j = module->stages.insert(i, stage.type); + if(i!=module->stages.end()) + i->previous = &*j; + i = j; + if(i!=module->stages.begin()) + i->previous = &*--j; + } + target = &*i; + } + + for(NodeList::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i) + target->content.body.push_back(*i); + apply(*target); +} + +void ProgramCompiler::process() +{ for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) generate(*i); for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ) @@ -133,33 +187,15 @@ void ProgramCompiler::process() void ProgramCompiler::import(const string &name) { string fn = name+".glsl"; + if(imported_names.count(fn)) + return; + imported_names.insert(fn); + RefPtr io = (resources ? resources->open_raw(fn) : Resources::get_builtins().open(fn)); if(!io) throw runtime_error(format("module %s not found", name)); ProgramParser import_parser; - Module &imported_module = import_parser.parse(*io); - - inject_block(module->shared.content, imported_module.shared.content); - apply(module->shared); - for(list::iterator i=imported_module.stages.begin(); i!=imported_module.stages.end(); ++i) - { - list::iterator j; - for(j=module->stages.begin(); (j!=module->stages.end() && j->typetype); ++j) ; - if(j==module->stages.end() || j->type>i->type) - { - j = module->stages.insert(j, *i); - list::iterator k = j; - if(++k!=module->stages.end()) - k->previous = &*j; - if(j!=module->stages.begin()) - j->previous = &*--(k=j); - } - else - { - inject_block(j->content, i->content); - apply(*j); - } - } + append_module(import_parser.parse(*io, fn)); } void ProgramCompiler::generate(Stage &stage) @@ -171,8 +207,8 @@ void ProgramCompiler::generate(Stage &stage) apply(stage); apply(stage); apply(stage); - apply(stage); apply(stage); + apply(stage); apply(stage); } @@ -827,6 +863,7 @@ void ProgramCompiler::InterfaceGenerator::insert_assignment(const string &left, ExpressionStatement *stmt = new ExpressionStatement; stmt->expression = assign; + stmt->visit(*this); insert_nodes.push_back(stmt); } @@ -842,7 +879,10 @@ void ProgramCompiler::InterfaceGenerator::visit(VariableReference &var) if(i==prev_out.end()) i = prev_out.find(in_prefix+var.name); if(i!=prev_out.end()) - generate_interface(*i->second, "in", var.name); + { + generate_interface(*i->second, "in", i->second->name); + var.name = i->second->name; + } } void ProgramCompiler::InterfaceGenerator::visit(VariableDeclaration &var) @@ -855,7 +895,10 @@ void ProgramCompiler::InterfaceGenerator::visit(VariableDeclaration &var) { remove_node = true; if(var.init_expression) + { insert_assignment(var.name, var.init_expression->clone()); + return; + } } } else if(var.interface=="in") @@ -944,28 +987,31 @@ void ProgramCompiler::InterfaceGenerator::visit(Passthrough &pass) } -void ProgramCompiler::VariableRenamer::visit(VariableReference &var) -{ - if(var.declaration) - var.name = var.declaration->name; -} - -void ProgramCompiler::VariableRenamer::visit(VariableDeclaration &var) -{ - if(var.linked_declaration) - var.name = var.linked_declaration->name; - TraversingVisitor::visit(var); -} - - ProgramCompiler::DeclarationReorderer::DeclarationReorderer(): + scope_level(0), kind(NO_DECLARATION) { } +void ProgramCompiler::DeclarationReorderer::visit(FunctionCall &call) +{ + FunctionDeclaration *def = call.declaration; + if(def) + def = def->definition; + if(def && !ordered_funcs.count(def)) + needed_funcs.insert(def); +} + void ProgramCompiler::DeclarationReorderer::visit(Block &block) { + SetForScope set(scope_level, scope_level+1); + if(scope_level>1) + return Visitor::visit(block); + list >::iterator struct_insert_point = block.body.end(); list >::iterator variable_insert_point = block.body.end(); + list >::iterator function_insert_point = block.body.end(); + unsigned unordered_func_count = 0; + bool ordered_any_funcs = false; for(list >::iterator i=block.body.begin(); i!=block.body.end(); ) { @@ -989,13 +1035,64 @@ void ProgramCompiler::DeclarationReorderer::visit(Block &block) else if(kind>VARIABLE && variable_insert_point==block.body.end()) variable_insert_point = i; + if(kind==FUNCTION) + { + if(function_insert_point==block.body.end()) + function_insert_point = i; + + if(needed_funcs.empty()) + { + ordered_funcs.insert(i->get()); + if(i!=function_insert_point) + { + block.body.insert(function_insert_point, *i); + moved = true; + } + else + ++function_insert_point; + ordered_any_funcs = true; + } + else + ++unordered_func_count; + } + if(moved) + { + if(function_insert_point==i) + ++function_insert_point; block.body.erase(i++); + } else ++i; + + if(i==block.body.end() && unordered_func_count) + { + if(!ordered_any_funcs) + // A subset of the remaining functions forms a recursive loop + /* TODO pick a function and move it up, adding any necessary + declarations */ + break; + + i = function_insert_point; + unordered_func_count = 0; + } } } +void ProgramCompiler::DeclarationReorderer::visit(ProgramSyntax::VariableDeclaration &var) +{ + Visitor::visit(var); + kind = VARIABLE; +} + +void ProgramCompiler::DeclarationReorderer::visit(FunctionDeclaration &func) +{ + needed_funcs.clear(); + func.body.visit(*this); + needed_funcs.erase(&func); + kind = FUNCTION; +} + ProgramCompiler::InlineableFunctionLocator::InlineableFunctionLocator(): in_function(0)