Mesa (master): iris: Copy dest size from the original intrinsic in setup_uniforms

[GitLab Mirror]

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

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Aug 11 10:38:22 2020 -0500

iris: Copy dest size from the original intrinsic in setup_uniforms

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6280>

---

 src/gallium/drivers/iris/iris_program.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index 80af3323bb9..8470022eb9d 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -535,15 +535,15 @@ iris_setup_uniforms(const struct brw_compiler *compiler,
             continue;
          }
 
-         unsigned comps = nir_intrinsic_dest_components(intrin);
-
          nir_intrinsic_instr *load =
             nir_intrinsic_instr_create(nir, nir_intrinsic_load_ubo);
-         load->num_components = comps;
+         load->num_components = intrin->dest.ssa.num_components;
          load->src[0] = nir_src_for_ssa(temp_ubo_name);
          load->src[1] = nir_src_for_ssa(offset);
          nir_intrinsic_set_align(load, 4, 0);
-         nir_ssa_dest_init(&load->instr, &load->dest, comps, 32, NULL);
+         nir_ssa_dest_init(&load->instr, &load->dest,
+                           intrin->dest.ssa.num_components,
+                           intrin->dest.ssa.bit_size, NULL);
          nir_builder_instr_insert(&b, &load->instr);
          nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
                                   nir_src_for_ssa(&load->dest.ssa));