X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=ca6c58057022b8b3a9f69373433c0f6c54a2e35d;hb=b30777959d8e2ab2caf489e32f40390f60a75fcb;hp=db9017cfb675745779ca45e7654f092ad9d868e6;hpb=99719790df8a1215465a68c7b1d87a495bff87eb;p=libs%2Fgl.git diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp index db9017cf..ca6c5805 100644 --- a/source/glsl/compiler.cpp +++ b/source/glsl/compiler.cpp @@ -3,6 +3,7 @@ #include #include "compatibility.h" #include "compiler.h" +#include "debug.h" #include "error.h" #include "generate.h" #include "optimize.h" @@ -19,6 +20,12 @@ namespace GL { namespace SL { Compiler::Compiler(): + features(Features::from_context()), + module(0) +{ } + +Compiler::Compiler(const Features &f): + features(f), module(0) { } @@ -56,10 +63,10 @@ void Compiler::load_source(IO::Base &io, const string &src_name) load_source(io, 0, src_name); } -void Compiler::compile() +void Compiler::compile(Mode mode) { for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) - generate(*i); + generate(*i, mode); for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ) { if(optimize(*i)) @@ -68,43 +75,70 @@ void Compiler::compile() ++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 - { - 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); - } - } - } - } - catch(const compile_error &e) + 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) { - throw compile_error(module->source_map.translate_errors(e.what())); + glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(i->type)); + glsl += Formatter().apply(*i, MODULE); + glsl += '\n'; } + + return glsl; +} + +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; +} + +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) @@ -143,8 +177,8 @@ void Compiler::append_stage(Stage &stage) target = &*i; } - if(stage.required_version>target->required_version) - target->required_version = stage.required_version; + 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); @@ -164,10 +198,11 @@ void Compiler::import(DataFile::Collection *resources, const string &name) 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); @@ -178,7 +213,8 @@ void Compiler::generate(Stage &stage) VariableResolver().apply(stage); DeclarationReorderer().apply(stage); FunctionResolver().apply(stage); - LegacyConverter().apply(stage); + if(mode==PROGRAM) + LegacyConverter().apply(stage, features); } bool Compiler::optimize(Stage &stage) @@ -195,11 +231,11 @@ bool Compiler::optimize(Stage &stage) 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); }