X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=89ffd7f3f0bb73cfa295a76ccac9b5f2776a099a;hb=dccad64b2ec82249d850b9745614042171499972;hp=21060cb4b783975f72da2a039de2f6a07b86888f;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;p=libs%2Fgl.git diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp index 21060cb4..89ffd7f3 100644 --- a/source/glsl/compiler.cpp +++ b/source/glsl/compiler.cpp @@ -1,14 +1,13 @@ #include #include #include -#include -#include #include "compatibility.h" #include "compiler.h" #include "error.h" #include "generate.h" #include "optimize.h" #include "output.h" +#include "resources.h" #include "shader.h" #undef interface @@ -20,7 +19,6 @@ namespace GL { namespace SL { Compiler::Compiler(): - resources(0), module(0) { } @@ -29,107 +27,113 @@ Compiler::~Compiler() delete module; } -void Compiler::compile(const string &source, const string &src_name) +void Compiler::clear() { - resources = 0; 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) +{ + clear(); Parser parser; imported_names.push_back(src_name); - append_module(parser.parse(source, src_name, 1)); - process(); + append_module(parser.parse(source, src_name, 1), 0); } -void Compiler::compile(IO::Base &io, Resources *res, const string &src_name) +void Compiler::load_source(IO::Base &io, DataFile::Collection *res, const string &src_name) { - resources = res; - delete module; - module = new Module(); + clear(); Parser parser; imported_names.push_back(src_name); - append_module(parser.parse(io, src_name, 1)); - process(); + append_module(parser.parse(io, src_name, 1), res); } -void Compiler::compile(IO::Base &io, const string &src_name) +void Compiler::load_source(IO::Base &io, const string &src_name) { - compile(io, 0, src_name); + load_source(io, 0, src_name); } -void Compiler::add_shaders(Program &program) +void Compiler::compile(Mode mode) { - if(!module) - throw invalid_operation("Compiler::add_shaders"); - - try + for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) + generate(*i, mode); + for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ) { - 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); - } - } - } + if(optimize(*i)) + i = module->stages.begin(); + else + ++i; } - 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::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) + finalize(*i, mode); +} + +string Compiler::get_combined_glsl() const +{ + string glsl; - throw compile_error(translated); + 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) + { + glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(i->type)); + glsl += Formatter().apply(*i, MODULE); + glsl += '\n'; } + + return glsl; } -void Compiler::append_module(Module &mod) +vector 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; +} + +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((*i)->module); - NodeRemover(set(imports.begin(), imports.end())).apply(mod.shared); + import(res, (*i)->module); + 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) @@ -165,22 +169,7 @@ void Compiler::append_stage(Stage &stage) DeclarationCombiner().apply(*target); } -void Compiler::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(); ) - { - if(optimize(*i)) - i = module->stages.begin(); - else - ++i; - } - for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) - finalize(*i); -} - -void Compiler::import(const string &name) +void Compiler::import(DataFile::Collection *resources, const string &name) { string fn = name+".glsl"; if(find(imported_names, fn)!=imported_names.end()) @@ -191,45 +180,46 @@ void Compiler::import(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())); + 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; inject_block(stage.content, module->shared.content); DeclarationReorderer().apply(stage); + BlockResolver().apply(stage); FunctionResolver().apply(stage); VariableResolver().apply(stage); InterfaceGenerator().apply(stage); VariableResolver().apply(stage); DeclarationReorderer().apply(stage); FunctionResolver().apply(stage); - LegacyConverter().apply(stage); + if(mode==PROGRAM) + LegacyConverter().apply(stage); } bool Compiler::optimize(Stage &stage) { ConstantConditionEliminator().apply(stage); - set inlineable = InlineableFunctionLocator().apply(stage); - FunctionInliner(inlineable).apply(stage); + FunctionInliner().apply(stage); + BlockResolver().apply(stage); + VariableResolver().apply(stage); - set unused = UnusedVariableLocator().apply(stage); - set unused2 = UnusedFunctionLocator().apply(stage); - unused.insert(unused2.begin(), unused2.end()); - NodeRemover(unused).apply(stage); + bool result = UnusedVariableRemover().apply(stage); + result |= UnusedFunctionRemover().apply(stage); - return !unused.empty(); + return result; } -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); }