Mesa (master): iris: use intrinsic builders

[GitLab Mirror]

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

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Sat Jan  2 08:43:52 2021 +0100

iris: use intrinsic builders

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8295>

---

 src/gallium/drivers/iris/iris_program.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index 8157e921850..a6e48bc61dd 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -565,20 +565,16 @@ iris_setup_uniforms(const struct brw_compiler *compiler,
             continue;
          }
 
-         nir_intrinsic_instr *load =
-            nir_intrinsic_instr_create(nir, nir_intrinsic_load_ubo);
-         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_intrinsic_set_range_base(load, 0);
-         nir_intrinsic_set_range(load, ~0);
-         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 *load =
+            nir_load_ubo(&b, intrin->dest.ssa.num_components, intrin->dest.ssa.bit_size,
+                         temp_ubo_name, offset,
+                         .align_mul = 4,
+                         .align_offset = 0,
+                         .range_base = 0,
+                         .range = ~0);
+
          nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
-                                  nir_src_for_ssa(&load->dest.ssa));
+                                  nir_src_for_ssa(load));
          nir_instr_remove(instr);
       }
    }