Move LegacyConverter invocation to the finalize stage

[libs/gl.git] / source / glsl / compiler.cpp

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index b4b63e27637c32231341a2631383c0b972be8019..03bde487075d3d67f37d1a0f52b9095eae36f4fd 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -24,12 +24,14 @@ namespace SL {
 Compiler::Compiler():
        features(Features::from_context()),
        module(0),
+       compiled(false),
        specialized(false)
 { }
 
 Compiler::Compiler(const Features &f):
        features(f),
        module(0),
+       compiled(false),
        specialized(false)
 { }
 
@@ -96,10 +98,15 @@ void Compiler::compile(Mode mode)
        }
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
                finalize(*i, mode);
+
+       compiled = true;
 }
 
 string Compiler::get_combined_glsl() const
 {
+       if(!compiled)
+               throw invalid_operation("Compiler::get_combined_glsl");
+
        string glsl;
 
        unsigned source_count = module->source_map.get_count();
@@ -126,6 +133,8 @@ vector<Stage::Type> Compiler::get_stages() const
 
 string Compiler::get_stage_glsl(Stage::Type stage_type) const
 {
+       if(!compiled)
+               throw invalid_operation("Compiler::get_stage_glsl");
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
                if(i->type==stage_type)
                        return Formatter().apply(*i);
@@ -134,6 +143,8 @@ string Compiler::get_stage_glsl(Stage::Type stage_type) const
 
 const map<string, unsigned> &Compiler::get_vertex_attributes() const
 {
+       if(!compiled)
+               throw invalid_operation("Compiler::get_vertex_attributes");
        for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
                if(i->type==Stage::VERTEX)
                        return i->locations;
@@ -142,6 +153,8 @@ const map<string, unsigned> &Compiler::get_vertex_attributes() const
 
 const map<string, unsigned> &Compiler::get_fragment_outputs() const
 {
+       if(!compiled)
+               throw invalid_operation("Compiler::get_fragment_outputs");
        for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
                if(i->type==Stage::FRAGMENT)
                        return i->locations;
@@ -251,11 +264,6 @@ void Compiler::generate(Stage &stage, Mode mode)
        resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
 
        ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
-       if(mode==PROGRAM)
-       {
-               LegacyConverter().apply(stage, features);
-               resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
-       }
 }
 
 template<typename T>
@@ -287,8 +295,8 @@ void Compiler::resolve(Stage &stage, unsigned flags)
 
 bool Compiler::validate(Stage &stage)
 {
-       TypeValidator().apply(stage);
        DeclarationValidator().apply(stage);
+       IdentifierValidator().apply(stage);
        ReferenceValidator().apply(stage);
        ExpressionValidator().apply(stage);
 
@@ -318,6 +326,8 @@ bool Compiler::diagnostic_line_order(const Diagnostic &diag1, const Diagnostic &
 
 Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
+       if(ConstantFolder().apply(stage))
+               resolve(stage, RESOLVE_EXPRESSIONS);
        ConstantConditionEliminator().apply(stage);
 
        bool any_inlined = false;
@@ -343,6 +353,12 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 
 void Compiler::finalize(Stage &stage, Mode mode)
 {
+       if(mode==PROGRAM)
+       {
+               LegacyConverter().apply(stage, features);
+               resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+       }
+
        if(get_gl_api()==OPENGL_ES2 && mode==PROGRAM)
                DefaultPrecisionGenerator().apply(stage);
        else if(mode==MODULE)