Mesa (master): glsl: fix incorrect optimisation in opt_constant_variable()

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b33f811068596c2764f6396a885f7aab7d7d411c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b33f811068596c2764f6396a885f7aab7d7d411c

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed Jun 10 15:19:22 2020 +1000

glsl: fix incorrect optimisation in opt_constant_variable()

When handling function inputs the optimisation pass incorrectly
assumes the inputs are undefined. Here we simply change things to
assume inputs have always been assigned a value. Any further
optimisations will be taken care of once function inlining takes
place.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2984
Fixes: 65122e9e8038 ("ir_constant_variable: New pass to mark constant-assigned variables constant.")

Reviewed-by: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5413>

---

 src/compiler/glsl/opt_constant_variable.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/compiler/glsl/opt_constant_variable.cpp b/src/compiler/glsl/opt_constant_variable.cpp
index cc2760f5609..3f2b6a04b9f 100644
--- a/src/compiler/glsl/opt_constant_variable.cpp
+++ b/src/compiler/glsl/opt_constant_variable.cpp
@@ -165,6 +165,15 @@ ir_constant_variable_visitor::visit_enter(ir_call *ir)
 	 entry = get_assignment_entry(var, this->ht);
 	 entry->assignment_count++;
       }
+
+      /* We don't know if the variable passed to this function has been
+       * assigned a value or if it is undefined, so for now we always assume
+       * it has been assigned a value. Once functions have been inlined any
+       * further potential optimisations will be taken care of.
+       */
+      struct assignment_entry *entry;
+      entry = get_assignment_entry(param, this->ht);
+      entry->assignment_count++;
    }
 
    /* Mark the return storage as having been assigned to */