X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=7ff589e7050bc854c1e3b3fd5856c42ea852405d;hb=1cd0ea7;hp=0579bb017267c08dfab0af9f177a8077e048244d;hpb=73bef37da97b6da0b99227f63235cb52c4e56c44;p=libs%2Fgl.git diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp index 0579bb01..7ff589e7 100644 --- a/source/glsl/compiler.cpp +++ b/source/glsl/compiler.cpp @@ -1,10 +1,10 @@ #include #include #include -#include -#include +#include "builtin.h" #include "compatibility.h" #include "compiler.h" +#include "debug.h" #include "error.h" #include "generate.h" #include "optimize.h" @@ -21,7 +21,15 @@ namespace GL { namespace SL { Compiler::Compiler(): - module(0) + features(Features::from_context()), + module(0), + specialized(false) +{ } + +Compiler::Compiler(const Features &f): + features(f), + module(0), + specialized(false) { } Compiler::~Compiler() @@ -34,6 +42,7 @@ void Compiler::clear() delete module; module = new Module(); imported_names.clear(); + module->source_map.set_name(0, ""); } void Compiler::set_source(const string &source, const string &src_name) @@ -57,95 +66,100 @@ void Compiler::load_source(IO::Base &io, const string &src_name) load_source(io, 0, src_name); } -void Compiler::compile() +void Compiler::specialize(const map &sv) +{ + specialized = true; + spec_values = sv; +} + +void Compiler::compile(Mode mode) { 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(); ) + generate(*i, mode); + unsigned n = 0; + for(list::iterator i=module->stages.begin(); (i!=module->stages.end() && n<10000); ++n) { - if(optimize(*i)) + OptimizeResult result = optimize(*i); + if(result==REDO_PREVIOUS) i = module->stages.begin(); - else + else if(result!=REDO_STAGE) ++i; } for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) - finalize(*i); + finalize(*i, mode); } -void Compiler::add_shaders(Program &program) +string Compiler::get_combined_glsl() const { - if(!module) - throw invalid_operation("Compiler::add_shaders"); + string glsl; - try + unsigned source_count = module->source_map.get_count(); + for(unsigned i=1; isource_map.get_name(i)); + for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) { - for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) - { - string stage_src = Formatter().apply(*i); - - if(i->type==Stage::VERTEX) - { - program.attach_shader_owned(new VertexShader(stage_src)); - for(map::iterator j=i->locations.begin(); j!=i->locations.end(); ++j) - program.bind_attribute(j->second, j->first); - } - else if(i->type==Stage::GEOMETRY) - program.attach_shader_owned(new GeometryShader(stage_src)); - else if(i->type==Stage::FRAGMENT) - { - program.attach_shader_owned(new FragmentShader(stage_src)); - if(EXT_gpu_shader4) - { - for(map::iterator j=i->locations.begin(); j!=i->locations.end(); ++j) - program.bind_fragment_data(j->second, j->first); - } - } - } + glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(i->type)); + glsl += Formatter().apply(*i, MODULE); + glsl += '\n'; } - catch(const compile_error &e) - { - static const Regex r_message("^(([0-9]+)\\(([0-9]+)\\) :|ERROR: ([0-9]+):([0-9]+):) (.*)$"); - vector lines = split(e.what(), '\n'); - string translated; - for(vector::const_iterator i=lines.begin(); i!=lines.end(); ++i) - { - RegMatch m = r_message.match(*i); - if(m) - { - unsigned index = 0; - unsigned line = 0; - if(m[2]) - { - index = lexical_cast(m[2].str); - line = lexical_cast(m[3].str); - } - else if(m[4]) - { - index = lexical_cast(m[4].str); - line = lexical_cast(m[5].str); - } - const char *src = ""; - if(index==0) - src = ""; - else if(index-1 Compiler::get_stages() const +{ + vector stage_types; + stage_types.reserve(module->stages.size()); + for(list::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i) + stage_types.push_back(i->type); + return stage_types; +} + +string Compiler::get_stage_glsl(Stage::Type stage_type) const +{ + for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) + if(i->type==stage_type) + return Formatter().apply(*i, PROGRAM); + throw key_error(Stage::get_stage_name(stage_type)); +} + +const map &Compiler::get_vertex_attributes() const +{ + for(list::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i) + if(i->type==Stage::VERTEX) + return i->locations; + throw invalid_operation("Compiler::get_vertex_attributes"); +} + +const map &Compiler::get_fragment_outputs() const +{ + for(list::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i) + if(i->type==Stage::FRAGMENT) + return i->locations; + throw invalid_operation("Compiler::get_fragment_outputs"); +} + +const SourceMap &Compiler::get_source_map() const +{ + return module->source_map; +} + +string Compiler::get_stage_debug(Stage::Type stage_type) const +{ + for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) + if(i->type==stage_type) + return DumpTree().apply(*i); + throw key_error(Stage::get_stage_name(stage_type)); } void Compiler::append_module(Module &mod, DataFile::Collection *res) { + module->source_map.merge_from(mod.source_map); + vector imports = NodeGatherer().apply(mod.shared); for(vector::iterator i=imports.begin(); i!=imports.end(); ++i) import(res, (*i)->module); - NodeRemover(set(imports.begin(), imports.end())).apply(mod.shared); + NodeRemover().apply(mod.shared, set(imports.begin(), imports.end())); append_stage(mod.shared); for(list::iterator i=mod.stages.begin(); i!=mod.stages.end(); ++i) @@ -174,8 +188,15 @@ void Compiler::append_stage(Stage &stage) target = &*i; } - if(stage.required_version>target->required_version) - target->required_version = stage.required_version; + if(target->content.body.empty()) + { + Stage *builtins = get_builtins(stage.type); + if(builtins && builtins!=&stage) + append_stage(*builtins); + } + + if(stage.required_features.glsl_version>target->required_features.glsl_version) + target->required_features.glsl_version = stage.required_features.glsl_version; for(NodeList::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i) target->content.body.push_back(*i); DeclarationCombiner().apply(*target); @@ -192,45 +213,57 @@ void Compiler::import(DataFile::Collection *resources, const string &name) if(!io) throw runtime_error(format("module %s not found", name)); Parser import_parser; - append_module(import_parser.parse(*io, fn, imported_names.size()), resources); + append_module(import_parser.parse(*io, fn, module->source_map.get_count()), resources); } -void Compiler::generate(Stage &stage) +void Compiler::generate(Stage &stage, Mode mode) { - if(module->shared.required_version>stage.required_version) - stage.required_version = module->shared.required_version; + stage.required_features.gl_api = features.gl_api; + if(module->shared.required_features.glsl_version>stage.required_features.glsl_version) + stage.required_features.glsl_version = module->shared.required_features.glsl_version; inject_block(stage.content, module->shared.content); - DeclarationReorderer().apply(stage); + // Initial resolving pass + BlockHierarchyResolver().apply(stage); FunctionResolver().apply(stage); VariableResolver().apply(stage); + + /* All variables local to a stage have been resolved. Resolve non-local + variables through interfaces. */ InterfaceGenerator().apply(stage); VariableResolver().apply(stage); - DeclarationReorderer().apply(stage); + FunctionResolver().apply(stage); - LegacyConverter().apply(stage); + ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0)); + if(mode==PROGRAM) + LegacyConverter().apply(stage, features); } -bool Compiler::optimize(Stage &stage) +Compiler::OptimizeResult Compiler::optimize(Stage &stage) { ConstantConditionEliminator().apply(stage); - set inlineable = InlineableFunctionLocator().apply(stage); - FunctionInliner(inlineable).apply(stage); + bool any_inlined = FunctionInliner().apply(stage); + any_inlined |= ExpressionInliner().apply(stage); + if(any_inlined) + { + VariableResolver().apply(stage); + FunctionResolver().apply(stage); + } - set unused = UnusedVariableLocator().apply(stage); - set unused2 = UnusedFunctionLocator().apply(stage); - unused.insert(unused2.begin(), unused2.end()); - NodeRemover(unused).apply(stage); + /* Removing variables or functions may cause things from the previous stage + to become unused. */ + bool any_removed = UnusedVariableRemover().apply(stage); + any_removed |= UnusedFunctionRemover().apply(stage); - return !unused.empty(); + return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE; } -void Compiler::finalize(Stage &stage) +void Compiler::finalize(Stage &stage, Mode mode) { - if(get_gl_api()==OPENGL_ES2) + if(get_gl_api()==OPENGL_ES2 && mode==PROGRAM) DefaultPrecisionGenerator().apply(stage); - else + else if(mode==MODULE) PrecisionRemover().apply(stage); }