Refactor FunctionInliner to do any necessary declaration reordering

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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 89ffd7f3f0bb73cfa295a76ccac9b5f2776a099a..55a69f0df38ecaf1b681f9a698e6bbc2abed02da 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -1,8 +1,10 @@
 #include <msp/core/algorithm.h>
 #include <msp/gl/extensions/ext_gpu_shader4.h>
 #include <msp/strings/format.h>
+#include "builtin.h"
 #include "compatibility.h"
 #include "compiler.h"
+#include "debug.h"
 #include "error.h"
 #include "generate.h"
 #include "optimize.h"
@@ -19,7 +21,15 @@ namespace GL {
 namespace SL {
 
 Compiler::Compiler():
-       module(0)
+       features(Features::from_context()),
+       module(0),
+       specialized(false)
+{ }
+
+Compiler::Compiler(const Features &f):
+       features(f),
+       module(0),
+       specialized(false)
 { }
 
 Compiler::~Compiler()
@@ -56,15 +66,23 @@ void Compiler::load_source(IO::Base &io, const string &src_name)
        load_source(io, 0, src_name);
 }
 
+void Compiler::specialize(const map<string, int> &sv)
+{
+       specialized = true;
+       spec_values = sv;
+}
+
 void Compiler::compile(Mode mode)
 {
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
                generate(*i, mode);
-       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
+       unsigned n = 0;
+       for(list<Stage>::iterator i=module->stages.begin(); (i!=module->stages.end() && n<10000); ++n)
        {
-               if(optimize(*i))
+               OptimizeResult result = optimize(*i);
+               if(result==REDO_PREVIOUS)
                        i = module->stages.begin();
-               else
+               else if(result!=REDO_STAGE)
                        ++i;
        }
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
@@ -126,6 +144,14 @@ const SourceMap &Compiler::get_source_map() const
        return module->source_map;
 }
 
+string Compiler::get_stage_debug(Stage::Type stage_type) const
+{
+       for(list<Stage>::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)
 {
        module->source_map.merge_from(mod.source_map);
@@ -162,8 +188,15 @@ void Compiler::append_stage(Stage &stage)
                target = &*i;
        }
 
-       if(stage.required_version>target->required_version)
-               target->required_version = stage.required_version;
+       if(target->content.body.empty())
+       {
+               Stage *builtins = get_builtins(stage.type);
+               if(builtins && builtins!=&stage)
+                       append_stage(*builtins);
+       }
+
+       if(stage.required_features.glsl_version>target->required_features.glsl_version)
+               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);
@@ -185,34 +218,41 @@ void Compiler::import(DataFile::Collection *resources, const string &name)
 
 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);
-       BlockResolver().apply(stage);
+       // Initial resolving pass
+       BlockHierarchyResolver().apply(stage);
        FunctionResolver().apply(stage);
        VariableResolver().apply(stage);
+
+       /* All variables local to a stage have been resolved.  Resolve non-local
+       variables through interfaces. */
        InterfaceGenerator().apply(stage);
        VariableResolver().apply(stage);
-       DeclarationReorderer().apply(stage);
+
        FunctionResolver().apply(stage);
+       ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
        if(mode==PROGRAM)
-               LegacyConverter().apply(stage);
+               LegacyConverter().apply(stage, features);
 }
 
-bool Compiler::optimize(Stage &stage)
+Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
        ConstantConditionEliminator().apply(stage);
 
-       FunctionInliner().apply(stage);
-       BlockResolver().apply(stage);
+       bool any_inlined = FunctionInliner().apply(stage);
+       BlockHierarchyResolver().apply(stage);
        VariableResolver().apply(stage);
 
-       bool result = UnusedVariableRemover().apply(stage);
-       result |= UnusedFunctionRemover().apply(stage);
+       /* Removing variables or functions may cause things from the previous stage
+       to become unused. */
+       bool any_removed = UnusedVariableRemover().apply(stage);
+       any_removed |= UnusedFunctionRemover().apply(stage);
 
-       return result;
+       return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
 }
 
 void Compiler::finalize(Stage &stage, Mode mode)