Remove unnecessary includes

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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 55a69f0df38ecaf1b681f9a698e6bbc2abed02da..7fe608bf6b0c80cce51a987f79ea4be225632494 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -1,5 +1,4 @@
 #include <msp/core/algorithm.h>
-#include <msp/gl/extensions/ext_gpu_shader4.h>
 #include <msp/strings/format.h>
 #include "builtin.h"
 #include "compatibility.h"
@@ -10,7 +9,6 @@
 #include "optimize.h"
 #include "output.h"
 #include "resources.h"
-#include "shader.h"
 
 #undef interface
 
@@ -244,8 +242,12 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
        ConstantConditionEliminator().apply(stage);
 
        bool any_inlined = FunctionInliner().apply(stage);
-       BlockHierarchyResolver().apply(stage);
-       VariableResolver().apply(stage);
+       any_inlined |= ExpressionInliner().apply(stage);
+       if(any_inlined)
+       {
+               VariableResolver().apply(stage);
+               FunctionResolver().apply(stage);
+       }
 
        /* Removing variables or functions may cause things from the previous stage
        to become unused. */