Combine the precision handling visitors and rewrite the logic

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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index e46e5401a8fbe452e8175cc622545d7f52caf6f7..d8b060ea4e3873285980373e45974ee1b6b84950 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -2,10 +2,10 @@
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "builtin.h"
-#include "compatibility.h"
 #include "compiler.h"
 #include "debug.h"
 #include "error.h"
+#include "finalize.h"
 #include "generate.h"
 #include "glsl_error.h"
 #include "optimize.h"
@@ -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();
@@ -108,7 +115,7 @@ string Compiler::get_combined_glsl() const
        for(list<Stage>::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 += Formatter().apply(*i);
                glsl += '\n';
        }
 
@@ -126,14 +133,18 @@ 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, PROGRAM);
+                       return Formatter().apply(*i);
        throw key_error(Stage::get_stage_name(stage_type));
 }
 
 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;
@@ -214,7 +227,6 @@ void Compiler::append_stage(Stage &stage)
                target->required_features.glsl_version = stage.required_features.glsl_version;
        for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
                target->content.body.push_back(*i);
-       DeclarationCombiner().apply(*target);
 }
 
 void Compiler::import(DataFile::Collection *resources, const string &name)
@@ -252,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>
@@ -282,17 +289,19 @@ void Compiler::resolve(Stage &stage, unsigned flags)
                else if(resolve<FunctionResolver>(stage, flags, RESOLVE_FUNCTIONS))
                        flags |= RESOLVE_EXPRESSIONS;
                else if(resolve<ExpressionResolver>(stage, flags, RESOLVE_EXPRESSIONS))
-                       flags |= RESOLVE_VARIABLES;
+                       flags |= RESOLVE_VARIABLES|RESOLVE_FUNCTIONS;
        }
 }
 
 bool Compiler::validate(Stage &stage)
 {
-       TypeValidator().apply(stage);
        DeclarationValidator().apply(stage);
+       IdentifierValidator().apply(stage);
        ReferenceValidator().apply(stage);
        ExpressionValidator().apply(stage);
 
+       stable_sort(stage.diagnostics, &diagnostic_line_order);
+
        for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
                if(i->severity==Diagnostic::ERR)
                        return false;
@@ -300,14 +309,31 @@ bool Compiler::validate(Stage &stage)
        return true;
 }
 
+bool Compiler::diagnostic_line_order(const Diagnostic &diag1, const Diagnostic &diag2)
+{
+       if(diag1.provoking_source!=diag2.provoking_source)
+       {
+               // Sort builtins first and imported modules according to import order.
+               if(diag1.provoking_source<=BUILTIN_SOURCE)
+                       return diag1.provoking_source<diag2.provoking_source;
+               else if(diag2.provoking_source<=BUILTIN_SOURCE)
+                       return false;
+               else
+                       return diag1.provoking_source>diag2.provoking_source;
+       }
+       return diag1.provoking_line<diag2.provoking_line;
+}
+
 Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
+       if(ConstantFolder().apply(stage))
+               resolve(stage, RESOLVE_EXPRESSIONS);
        ConstantConditionEliminator().apply(stage);
 
        bool any_inlined = false;
        if(FunctionInliner().apply(stage))
        {
-               resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+               resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
                any_inlined = true;
        }
        if(ExpressionInliner().apply(stage))
@@ -327,10 +353,12 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 
 void Compiler::finalize(Stage &stage, Mode mode)
 {
-       if(get_gl_api()==OPENGL_ES2 && mode==PROGRAM)
-               DefaultPrecisionGenerator().apply(stage);
-       else if(mode==MODULE)
-               PrecisionRemover().apply(stage);
+       if(mode==PROGRAM)
+       {
+               LegacyConverter().apply(stage, features);
+               resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+               PrecisionConverter().apply(stage);
+       }
 }
 
 void Compiler::inject_block(Block &target, const Block &source)