Refactor resolution of declarations for MemberAccess

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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index f5540139e3391cffd1afd1b9f2f8e709fa4b99d5..30a3f08c58a98b34cf10ffc8224540375978c69e 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -86,7 +86,7 @@ void Compiler::compile(Mode mode)
                throw invalid_shader_source(get_diagnostics());
 
        unsigned n = 0;
-       for(list<Stage>::iterator i=module->stages.begin(); (i!=module->stages.end() && n<10000); ++n)
+       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++n)
        {
                OptimizeResult result = optimize(*i);
                if(result==REDO_PREVIOUS)
@@ -241,15 +241,12 @@ void Compiler::generate(Stage &stage, Mode mode)
 
        // Initial resolving pass
        BlockHierarchyResolver().apply(stage);
-       TypeResolver().apply(stage);
-       FunctionResolver().apply(stage);
-       VariableResolver().apply(stage);
+       resolve(stage);
 
        /* All variables local to a stage have been resolved.  Resolve non-local
        variables through interfaces. */
        InterfaceGenerator().apply(stage);
-       TypeResolver().apply(stage);
-       VariableResolver().apply(stage);
+       resolve(stage);
 
        FunctionResolver().apply(stage);
        ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
@@ -257,9 +254,21 @@ void Compiler::generate(Stage &stage, Mode mode)
                LegacyConverter().apply(stage, features);
 }
 
+void Compiler::resolve(Stage &stage)
+{
+       TypeResolver().apply(stage);
+       // Use the bitwise or to always evaluate both operands
+       while(VariableResolver().apply(stage) |
+               ExpressionResolver().apply(stage)) ;
+       FunctionResolver().apply(stage);
+}
+
 bool Compiler::validate(Stage &stage)
 {
+       TypeValidator().apply(stage);
        DeclarationValidator().apply(stage);
+       ReferenceValidator().apply(stage);
+       ExpressionValidator().apply(stage);
 
        for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
                if(i->severity==Diagnostic::ERR)
@@ -275,16 +284,13 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
        bool any_inlined = FunctionInliner().apply(stage);
        any_inlined |= ExpressionInliner().apply(stage);
        if(any_inlined)
-       {
-               TypeResolver().apply(stage);
-               VariableResolver().apply(stage);
-               FunctionResolver().apply(stage);
-       }
+               resolve(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);
+       any_removed |= UnusedTypeRemover().apply(stage);
 
        return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
 }