Make constant id range configurable and avoid duplicates

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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index b810e52bef5e0af758379f4c12a086a13d22a8e5..5ff003e71722e5da09d0cda8786bbca89f7726f8 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -79,7 +79,8 @@ void Compiler::specialize(const map<string, int> &sv)
 void Compiler::compile(Mode mode)
 {
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-               generate(*i, mode);
+               generate(*i);
+       ConstantIdAssigner().apply(*module, features);
 
        bool valid = true;
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
@@ -88,8 +89,12 @@ void Compiler::compile(Mode mode)
        if(!valid)
                throw invalid_shader_source(get_diagnostics());
 
-       unsigned n = 0;
-       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++n)
+       if(mode==PROGRAM && specialized)
+       {
+               for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+                       ConstantSpecializer().apply(*i, spec_values);
+       }
+       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
        {
                OptimizeResult result = optimize(*i);
                if(result==REDO_PREVIOUS)
@@ -244,7 +249,7 @@ 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, Mode mode)
+void Compiler::generate(Stage &stage)
 {
        stage.required_features.gl_api = features.gl_api;
        if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
@@ -263,8 +268,6 @@ void Compiler::generate(Stage &stage, Mode mode)
        variables through interfaces. */
        InterfaceGenerator().apply(stage);
        resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
-
-       ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
 }
 
 template<typename T>