Allocate locations to interface variables

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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index fab054737a8872bc7e8631b2298615c0fc9b6cf0..1948722a6c29b24fb3a36c92759a3dec592479d3 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -80,10 +80,15 @@ void Compiler::compile(Mode mode)
 {
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
                generate(*i);
+       ConstantIdAssigner().apply(*module, features);
+
+       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+               validate(*i);
+       GlobalInterfaceValidator().apply(*module);
 
        bool valid = true;
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-               if(!validate(*i))
+               if(!check_errors(*i))
                        valid = false;
        if(!valid)
                throw invalid_shader_source(get_diagnostics());
@@ -101,6 +106,8 @@ void Compiler::compile(Mode mode)
                else if(result!=REDO_STAGE)
                        ++i;
        }
+
+       LocationAllocator().apply(*module);
        for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
                finalize(*i, mode);
 
@@ -267,8 +274,6 @@ void Compiler::generate(Stage &stage)
        variables through interfaces. */
        InterfaceGenerator().apply(stage);
        resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
-
-       ConstantIdAssigner().apply(stage);
 }
 
 template<typename T>
@@ -298,13 +303,17 @@ void Compiler::resolve(Stage &stage, unsigned flags)
        }
 }
 
-bool Compiler::validate(Stage &stage)
+void Compiler::validate(Stage &stage)
 {
        DeclarationValidator().apply(stage);
        IdentifierValidator().apply(stage);
        ReferenceValidator().apply(stage);
        ExpressionValidator().apply(stage);
+       StageInterfaceValidator().apply(stage);
+}
 
+bool Compiler::check_errors(Stage &stage)
+{
        stable_sort(stage.diagnostics, &diagnostic_line_order);
 
        for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)