Mesa (staging/19.1): iris: Don't assume UBO indices are constant

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: a19270007c272b12d271807767421b8965411def
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a19270007c272b12d271807767421b8965411def

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue May 28 21:56:04 2019 -0500

iris: Don't assume UBO indices are constant

It will be true for the constant/system value buffer because they use a
constant zero but it's not true in general.  If we ever got here when
the source wasn't constant, nir_src_as_uint would assert.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 9dc57eebd578b976b94c54d083377ba0920d43a8)

---

 src/gallium/drivers/iris/iris_program.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index 30ec3f1ff86..7512889c47b 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -468,7 +468,8 @@ iris_setup_uniforms(const struct brw_compiler *compiler,
             if (load->src[0].ssa == temp_ubo_name) {
                nir_instr_rewrite_src(instr, &load->src[0],
                                      nir_src_for_ssa(nir_imm_int(&b, 0)));
-            } else if (nir_src_as_uint(load->src[0]) == 0) {
+            } else if (nir_src_is_const(load->src[0]) &&
+                       nir_src_as_uint(load->src[0]) == 0) {
                nir_ssa_def *offset =
                   nir_iadd(&b, load->src[1].ssa,
                            nir_imm_int(&b, 4 * num_system_values));