X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=4c08a0c1e1e34bf84c4e99e0d9f6f33090d6d103;hb=3e555c51a85b97090ae8c9b16ee425ee5ffe6ef8;hp=989098d7d0cf6410b4d26faed46f9c400bc06a3c;hpb=dad209400d4e5d39076d949364f598b854c7a5d7;p=libs%2Fgl.git diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp index 989098d7..4c08a0c1 100644 --- a/source/programcompiler.cpp +++ b/source/programcompiler.cpp @@ -209,6 +209,8 @@ void ProgramCompiler::append_stage(Stage &stage) target = &*i; } + if(stage.required_version>target->required_version) + target->required_version = stage.required_version; for(NodeList::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i) target->content.body.push_back(*i); apply(*target); @@ -245,6 +247,8 @@ void ProgramCompiler::import(const string &name) void ProgramCompiler::generate(Stage &stage) { + if(module->shared.required_version>stage.required_version) + stage.required_version = module->shared.required_version; inject_block(stage.content, module->shared.content); apply(stage); @@ -348,6 +352,7 @@ void ProgramCompiler::BlockModifier::visit(Block &block) ProgramCompiler::Formatter::Formatter(): + source_index(0), source_line(1), indent(0), parameter_list(false)