X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=c35fa275c2b1bbadbcfbfb8f113cf68d165d4a8a;hp=7224df1efba672d4afb7ecb12923a0109ae9f6f6;hb=6dc2da27f0831d4172fcfeba4900616fd6c844b8;hpb=00be85f53c5bec0be00a7ed6271e1f5a38e0b534 diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp index 7224df1e..c35fa275 100644 --- a/source/programcompiler.cpp +++ b/source/programcompiler.cpp @@ -122,6 +122,8 @@ void ProgramCompiler::process() else ++i; } + for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) + finalize(*i); } void ProgramCompiler::import(const string &name) @@ -160,6 +162,7 @@ void ProgramCompiler::generate(Stage &stage) { inject_block(stage.content, module->shared.content); + apply(stage); apply(stage); apply(stage); apply(stage); @@ -173,6 +176,9 @@ bool ProgramCompiler::optimize(Stage &stage) { apply(stage); + set inlineable = apply(stage); + apply(stage, inlineable); + set unused = apply(stage); set unused2 = apply(stage); unused.insert(unused2.begin(), unused2.end()); @@ -181,6 +187,14 @@ bool ProgramCompiler::optimize(Stage &stage) return !unused.empty(); } +void ProgramCompiler::finalize(Stage &stage) +{ + if(get_gl_api()==OPENGL_ES2) + apply(stage); + else + apply(stage); +} + void ProgramCompiler::inject_block(Block &target, const Block &source) { list >::iterator insert_point = target.body.begin(); @@ -216,6 +230,38 @@ void ProgramCompiler::Visitor::apply(Stage &s) } +ProgramCompiler::BlockModifier::BlockModifier(): + remove_node(false) +{ } + +void ProgramCompiler::BlockModifier::flatten_block(Block &block) +{ + insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end()); + remove_node = true; +} + +void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list >::iterator &i) +{ + 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; +} + +void ProgramCompiler::BlockModifier::visit(Block &block) +{ + for(list >::iterator i=block.body.begin(); i!=block.body.end(); ) + { + (*i)->visit(*this); + apply_and_increment(block, i); + } +} + + ProgramCompiler::Formatter::Formatter(): indent(0), parameter_list(false), @@ -224,9 +270,17 @@ ProgramCompiler::Formatter::Formatter(): void ProgramCompiler::Formatter::apply(ProgramSyntax::Stage &s) { + GLApi api = get_gl_api(); const Version &ver = s.required_version; - if(ver.major) - formatted += format("#version %d%d\n", ver.major, ver.minor); + + if(ver) + { + formatted += format("#version %d%02d", ver.major, ver.minor); + if(api==OPENGL_ES2 && ver>=Version(3, 0)) + formatted += " es"; + formatted += '\n'; + } + Visitor::apply(s); } @@ -325,6 +379,11 @@ void ProgramCompiler::Formatter::visit(Import &import) formatted += format("import %s;", import.module); } +void ProgramCompiler::Formatter::visit(Precision &prec) +{ + formatted += format("precision %s %s;", prec.precision, prec.type); +} + void ProgramCompiler::Formatter::visit(Layout &layout) { formatted += "layout("; @@ -364,7 +423,19 @@ void ProgramCompiler::Formatter::visit(VariableDeclaration &var) if(!var.sampling.empty()) formatted += format("%s ", var.sampling); if(!var.interface.empty() && var.interface!=block_interface) - formatted += format("%s ", var.interface); + { + string interface = var.interface; + if(stage->required_versiontype==VERTEX && var.interface=="in") + interface = "attribute"; + else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in")) + interface = "varying"; + } + formatted += format("%s ", interface); + } + if(!var.precision.empty()) + formatted += format("%s ", var.precision); formatted += format("%s %s", var.type, var.name); if(var.array) { @@ -449,10 +520,15 @@ void ProgramCompiler::Formatter::visit(Return &ret) formatted += ';'; } +void ProgramCompiler::Formatter::visit(Jump &jump) +{ + formatted += jump.keyword; + formatted += ';'; +} + ProgramCompiler::DeclarationCombiner::DeclarationCombiner(): - toplevel(true), - remove_node(false) + toplevel(true) { } void ProgramCompiler::DeclarationCombiner::visit(Block &block) @@ -461,15 +537,7 @@ void ProgramCompiler::DeclarationCombiner::visit(Block &block) return; SetForScope set(toplevel, false); - for(list >::iterator i=block.body.begin(); i!=block.body.end(); ) - { - remove_node = false; - (*i)->visit(*this); - if(remove_node) - block.body.erase(i++); - else - ++i; - } + BlockModifier::visit(block); } void ProgramCompiler::DeclarationCombiner::visit(FunctionDeclaration &func) @@ -669,38 +737,6 @@ void ProgramCompiler::FunctionResolver::visit(FunctionDeclaration &func) } -ProgramCompiler::BlockModifier::BlockModifier(): - remove_node(false) -{ } - -void ProgramCompiler::BlockModifier::flatten_block(Block &block) -{ - insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end()); - remove_node = true; -} - -void ProgramCompiler::BlockModifier::apply_and_increment(Block &block, list >::iterator &i) -{ - 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; -} - -void ProgramCompiler::BlockModifier::visit(Block &block) -{ - for(list >::iterator i=block.body.begin(); i!=block.body.end(); ) - { - (*i)->visit(*this); - apply_and_increment(block, i); - } -} - - ProgramCompiler::InterfaceGenerator::InterfaceGenerator(): scope_level(0) { } @@ -957,6 +993,108 @@ void ProgramCompiler::DeclarationReorderer::visit(Block &block) } +ProgramCompiler::InlineableFunctionLocator::InlineableFunctionLocator(): + in_function(0) +{ } + +void ProgramCompiler::InlineableFunctionLocator::visit(FunctionCall &call) +{ + FunctionDeclaration *def = call.declaration; + if(def && def->definition!=def) + def = def->definition; + + if(def) + { + unsigned &count = refcounts[def]; + ++count; + if(count>1 || def==in_function) + inlineable.erase(def); + } + + TraversingVisitor::visit(call); +} + +void ProgramCompiler::InlineableFunctionLocator::visit(FunctionDeclaration &func) +{ + unsigned &count = refcounts[func.definition]; + if(!count && func.parameters.empty()) + inlineable.insert(func.definition); + + SetForScope set(in_function, &func); + TraversingVisitor::visit(func); +} + + +ProgramCompiler::FunctionInliner::FunctionInliner(): + extract_result(0) +{ } + +ProgramCompiler::FunctionInliner::FunctionInliner(const set &in): + inlineable(in), + extract_result(0) +{ } + +void ProgramCompiler::FunctionInliner::visit_and_inline(RefPtr &ptr) +{ + inline_result = 0; + ptr->visit(*this); + if(inline_result) + ptr = inline_result; +} + +void ProgramCompiler::FunctionInliner::visit(Block &block) +{ + if(extract_result) + --extract_result; + + for(list >::iterator i=block.body.begin(); i!=block.body.end(); ++i) + { + (*i)->visit(*this); + if(extract_result) + --extract_result; + } +} + +void ProgramCompiler::FunctionInliner::visit(UnaryExpression &unary) +{ + visit_and_inline(unary.expression); + inline_result = 0; +} + +void ProgramCompiler::FunctionInliner::visit(BinaryExpression &binary) +{ + visit_and_inline(binary.left); + visit_and_inline(binary.right); + inline_result = 0; +} + +void ProgramCompiler::FunctionInliner::visit(FunctionCall &call) +{ + for(vector >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i) + visit_and_inline(*i); + + FunctionDeclaration *def = call.declaration; + if(def && def->definition!=def) + def = def->definition; + + if(def && inlineable.count(def)) + { + extract_result = 2; + def->visit(*this); + } + else + inline_result = 0; +} + +void ProgramCompiler::FunctionInliner::visit(Return &ret) +{ + TraversingVisitor::visit(ret); + + if(extract_result) + inline_result = ret.expression->clone(); +} + + ProgramCompiler::ExpressionEvaluator::ExpressionEvaluator(): variable_values(0), result(0.0f), @@ -1101,38 +1239,39 @@ void ProgramCompiler::ConstantConditionEliminator::visit(Iteration &iter) ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator(): aggregate(0), assignment(0), - assignment_target(false) + assignment_target(false), + global_scope(true) { } void ProgramCompiler::UnusedVariableLocator::apply(Stage &s) { - assignments.push_back(BlockAssignmentMap()); + variables.push_back(BlockVariableMap()); Visitor::apply(s); - assignments.pop_back(); + BlockVariableMap &global_variables = variables.back(); + for(BlockVariableMap::iterator i=global_variables.begin(); i!=global_variables.end(); ++i) + { + if(i->first->interface=="out" && (s.type==FRAGMENT || i->first->linked_declaration || !i->first->name.compare(0, 3, "gl_"))) + continue; + if(!i->second.referenced) + { + unused_nodes.insert(i->first); + clear_assignments(i->second, true); + } + } + variables.pop_back(); } void ProgramCompiler::UnusedVariableLocator::visit(VariableReference &var) { - unused_nodes.erase(var.declaration); - map::iterator i = aggregates.find(var.declaration); if(i!=aggregates.end()) unused_nodes.erase(i->second); - if(assignment_target) - return; - - for(vector::iterator j=assignments.end(); j!=assignments.begin(); ) + if(var.declaration && !assignment_target) { - --j; - BlockAssignmentMap::iterator k = j->find(var.declaration); - if(k!=j->end()) - { - for(vector::iterator l=k->second.nodes.begin(); l!=k->second.nodes.end(); ++l) - unused_nodes.erase(*l); - j->erase(k); - break; - } + VariableInfo &var_info = variables.back()[var.declaration]; + var_info.assignments.clear(); + var_info.referenced = true; } } @@ -1166,14 +1305,21 @@ void ProgramCompiler::UnusedVariableLocator::visit(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]; + VariableInfo &var_info = variables.back()[&var]; if(!self_ref) - var_assignments.nodes.clear(); - var_assignments.nodes.push_back(&node); - var_assignments.conditional = false; - var_assignments.self_referencing = self_ref; + clear_assignments(var_info, true); + var_info.assignments.push_back(&node); + var_info.conditionally_assigned = false; +} + +void ProgramCompiler::UnusedVariableLocator::clear_assignments(VariableInfo &var_info, bool mark_unused) +{ + if(mark_unused) + { + for(vector::iterator i=var_info.assignments.begin(); i!=var_info.assignments.end(); ++i) + unused_nodes.insert(*i); + } + var_info.assignments.clear(); } void ProgramCompiler::UnusedVariableLocator::visit(ExpressionStatement &expr) @@ -1197,7 +1343,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(VariableDeclaration &var) aggregates[&var] = aggregate; else { - unused_nodes.insert(&var); + variables.back()[&var].local = true; if(var.init_expression) record_assignment(var, *var.init_expression, false); } @@ -1214,90 +1360,106 @@ void ProgramCompiler::UnusedVariableLocator::visit(InterfaceBlock &iface) void ProgramCompiler::UnusedVariableLocator::visit(FunctionDeclaration &func) { - assignments.push_back(BlockAssignmentMap()); + variables.push_back(BlockVariableMap()); - for(vector >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i) - (*i)->visit(*this); - func.body.visit(*this); - - BlockAssignmentMap &block_assignments = assignments.back(); - for(map::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::iterator j=i->second.nodes.begin(); j!=i->second.nodes.end(); ++j) - unused_nodes.erase(*j); + SetForScope set(global_scope, false); + for(vector >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i) + (*i)->visit(*this); + func.body.visit(*this); } - assignments.pop_back(); + BlockVariableMap &block_variables = variables.back(); + for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i) + i->second.conditionally_assigned = true; + for(vector >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i) + block_variables[i->get()].referenced = true; + merge_down_variables(); } -void ProgramCompiler::UnusedVariableLocator::merge_down_assignments() +void ProgramCompiler::UnusedVariableLocator::merge_down_variables() { - BlockAssignmentMap &parent_assignments = assignments[assignments.size()-2]; - BlockAssignmentMap &block_assignments = assignments.back(); - for(BlockAssignmentMap::iterator i=block_assignments.begin(); i!=block_assignments.end(); ++i) + BlockVariableMap &parent_variables = variables[variables.size()-2]; + BlockVariableMap &block_variables = variables.back(); + for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.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) + if(i->second.local) { - 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; + if(!i->second.referenced) + unused_nodes.insert(i->first); + clear_assignments(i->second, true); + continue; } + + BlockVariableMap::iterator j = parent_variables.find(i->first); + if(j==parent_variables.end()) + parent_variables.insert(*i); else - j->second = i->second; + { + if(i->second.referenced || !i->second.conditionally_assigned) + clear_assignments(j->second, !i->second.referenced); + j->second.conditionally_assigned = i->second.conditionally_assigned; + j->second.referenced |= i->second.referenced; + j->second.assignments.insert(j->second.assignments.end(), i->second.assignments.begin(), i->second.assignments.end()); + } } - assignments.pop_back(); + variables.pop_back(); } void ProgramCompiler::UnusedVariableLocator::visit(Conditional &cond) { cond.condition->visit(*this); - assignments.push_back(BlockAssignmentMap()); + variables.push_back(BlockVariableMap()); cond.body.visit(*this); - BlockAssignmentMap if_assignments; - swap(assignments.back(), if_assignments); + BlockVariableMap if_variables; + swap(variables.back(), if_variables); cond.else_body.visit(*this); - BlockAssignmentMap &else_assignments = assignments.back(); - for(BlockAssignmentMap::iterator i=else_assignments.begin(); i!=else_assignments.end(); ++i) + BlockVariableMap &else_variables = variables.back(); + for(BlockVariableMap::iterator i=else_variables.begin(); i!=else_variables.end(); ++i) { - BlockAssignmentMap::iterator j = if_assignments.find(i->first); - if(j!=if_assignments.end()) + BlockVariableMap::iterator j = if_variables.find(i->first); + if(j!=if_variables.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); + i->second.assignments.insert(i->second.assignments.end(), j->second.assignments.begin(), j->second.assignments.end()); + i->second.conditionally_assigned |= j->second.conditionally_assigned; + if_variables.erase(j); } else - i->second.conditional = true; + i->second.conditionally_assigned = true; } - for(BlockAssignmentMap::iterator i=if_assignments.begin(); i!=if_assignments.end(); ++i) + for(BlockVariableMap::iterator i=if_variables.begin(); i!=if_variables.end(); ++i) { - i->second.conditional = true; - else_assignments.insert(*i); + i->second.conditionally_assigned = true; + else_variables.insert(*i); } - merge_down_assignments(); + merge_down_variables(); } void ProgramCompiler::UnusedVariableLocator::visit(Iteration &iter) { - assignments.push_back(BlockAssignmentMap()); + variables.push_back(BlockVariableMap()); TraversingVisitor::visit(iter); - merge_down_assignments(); + + BlockVariableMap &block_variables = variables.back(); + for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i) + if(!i->second.local && i->second.referenced) + i->second.assignments.clear(); + + merge_down_variables(); } +ProgramCompiler::UnusedVariableLocator::VariableInfo::VariableInfo(): + local(false), + conditionally_assigned(false), + referenced(false) +{ } + + void ProgramCompiler::UnusedFunctionLocator::visit(FunctionCall &call) { TraversingVisitor::visit(call); @@ -1311,7 +1473,7 @@ void ProgramCompiler::UnusedFunctionLocator::visit(FunctionDeclaration &func) { TraversingVisitor::visit(func); - if(func.name!="main" && !used_definitions.count(&func)) + if((func.name!="main" || func.body.body.empty()) && !used_definitions.count(&func)) unused_nodes.insert(&func); } @@ -1347,15 +1509,78 @@ void ProgramCompiler::NodeRemover::visit(VariableDeclaration &var) } +void ProgramCompiler::PrecisionRemover::visit(Precision &) +{ + remove_node = true; +} + +void ProgramCompiler::PrecisionRemover::visit(VariableDeclaration &var) +{ + var.precision.clear(); +} + + +ProgramCompiler::DefaultPrecisionGenerator::DefaultPrecisionGenerator(): + toplevel(true) +{ } + +void ProgramCompiler::DefaultPrecisionGenerator::visit(Block &block) +{ + if(toplevel) + { + SetForScope set(toplevel, false); + BlockModifier::visit(block); + } + else + Visitor::visit(block); +} + +void ProgramCompiler::DefaultPrecisionGenerator::visit(Precision &prec) +{ + have_default.insert(prec.type); +} + +void ProgramCompiler::DefaultPrecisionGenerator::visit(VariableDeclaration &var) +{ + if(var.type_declaration) + return; + + string type = var.type; + if(!type.compare(0, 3, "vec") || !type.compare(0, 3, "mat")) + type = "float"; + else if(!type.compare(0, 3, "ivec") || type=="uint") + type = "int"; + + if(!have_default.count(type)) + { + Precision *prec = new Precision; + if(!type.compare(0, 7, "sampler")) + prec->precision = "lowp"; + else if(stage->type==FRAGMENT) + prec->precision = "mediump"; + else + prec->precision = "highp"; + prec->type = type; + insert_nodes.push_back(prec); + + have_default.insert(type); + } +} + + ProgramCompiler::LegacyConverter::LegacyConverter(): - target_version(get_glsl_version()) + target_api(get_gl_api()), + target_version(get_glsl_version()), + frag_out(0) { } ProgramCompiler::LegacyConverter::LegacyConverter(const Version &v): - target_version(v) + target_api(get_gl_api()), + target_version(v), + frag_out(0) { } -bool ProgramCompiler::LegacyConverter::check_version(const Version &feature_version) +bool ProgramCompiler::LegacyConverter::check_version(const Version &feature_version) const { if(target_version >::iterator i = call.arguments.begin(); if(i!=call.arguments.end()) @@ -1406,9 +1654,17 @@ void ProgramCompiler::LegacyConverter::visit(FunctionCall &call) TraversingVisitor::visit(call); } +bool ProgramCompiler::LegacyConverter::supports_interface_layouts() const +{ + if(target_api==OPENGL_ES2) + return check_version(Version(3, 0)); + else + return check_version(Version(3, 30)); +} + void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var) { - if(var.layout && !check_version(Version(3, 30))) + if(var.layout && !supports_interface_layouts()) { vector::iterator i; for(i=var.layout->qualifiers.begin(); (i!=var.layout->qualifiers.end() && i->identifier!="location"); ++i) ; @@ -1431,15 +1687,11 @@ void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var) } } - if((var.interface=="in" || var.interface=="out") && !check_version(Version(1, 30))) + if((var.interface=="in" || var.interface=="out") && !supports_unified_interface_syntax()) { - if(stage->type==VERTEX && var.interface=="in") - var.interface = "attribute"; - else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in")) - var.interface = "varying"; - else if(stage->type==FRAGMENT && var.interface=="out") + if(stage->type==FRAGMENT && var.interface=="out") { - frag_out_name = var.name; + frag_out = &var; remove_node = true; } } @@ -1447,9 +1699,22 @@ void ProgramCompiler::LegacyConverter::visit(VariableDeclaration &var) TraversingVisitor::visit(var); } +bool ProgramCompiler::LegacyConverter::supports_interface_blocks(const string &iface) const +{ + if(target_api==OPENGL_ES2) + { + if(iface=="uniform") + return check_version(Version(3, 0)); + else + return check_version(Version(3, 20)); + } + else + return check_version(Version(1, 50)); +} + void ProgramCompiler::LegacyConverter::visit(InterfaceBlock &iface) { - if(!check_version(Version(1, 50))) + if(!supports_interface_blocks(iface.interface)) flatten_block(iface.members); }