Resolve variables after eliminating constant conditions

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 4e9f94d86b51e0044786927f7bc77c6d8e32c720..a447c9c9adbb5c07550bfb090b0923552a1d916a 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -364,7 +364,8 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
        if(ConstantFolder().apply(stage))
                resolve(stage, RESOLVE_EXPRESSIONS);
-       ConstantConditionEliminator().apply(stage);
+       if(ConstantConditionEliminator().apply(stage))
+               resolve(stage, RESOLVE_VARIABLES);
 
        bool any_inlined = false;
        if(FunctionInliner().apply(stage))

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 64ceddcc16ba92968c2f0d517f0230bb8e739598..ea0f96f0e60920cba9dd23523e83c37a07133ffb 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -1057,10 +1057,11 @@ void ConstantFolder::visit(Iteration &iter)
 }
 
 
-void ConstantConditionEliminator::apply(Stage &stage)
+bool ConstantConditionEliminator::apply(Stage &stage)
 {
        stage.content.visit(*this);
        NodeRemover().apply(stage, nodes_to_remove);
+       return !nodes_to_remove.empty();
 }
 
 ConstantConditionEliminator::ConstantStatus ConstantConditionEliminator::check_constant_condition(const Expression &expr)

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 82fc78cc546e562b5c77ea096112ae2ec59fab38..75fffa13bb4fcaf6527d56ab676a7b88553cb8c5 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -262,7 +262,7 @@ private:
        bool r_external_side_effects = false;
 
 public:
-       void apply(Stage &);
+       bool apply(Stage &);
 
 private:
        ConstantStatus check_constant_condition(const Expression &);