Mesa (master): tgsi_to_nir: use intrinsic builders

[GitLab Mirror]

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

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Fri Jan  1 20:53:51 2021 +0100

tgsi_to_nir: 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/auxiliary/nir/tgsi_to_nir.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 2f6cb1b60f2..4eac81856f9 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -1110,17 +1110,13 @@ ttn_ucmp(nir_builder *b, nir_op op, nir_alu_dest dest, nir_ssa_def **src)
 static void
 ttn_barrier(nir_builder *b)
 {
-   nir_intrinsic_instr *barrier =
-      nir_intrinsic_instr_create(b->shader, nir_intrinsic_control_barrier);
-   nir_builder_instr_insert(b, &barrier->instr);
+   nir_control_barrier(b);
 }
 
 static void
 ttn_kill(nir_builder *b, nir_op op, nir_alu_dest dest, nir_ssa_def **src)
 {
-   nir_intrinsic_instr *discard =
-      nir_intrinsic_instr_create(b->shader, nir_intrinsic_discard);
-   nir_builder_instr_insert(b, &discard->instr);
+   nir_discard(b);
    b->shader->info.fs.uses_discard = true;
 }
 
@@ -1132,10 +1128,7 @@ ttn_kill_if(nir_builder *b, nir_op op, nir_alu_dest dest, nir_ssa_def **src)
    nir_ssa_def *cmp = nir_bany(b, nir_flt(b, src[0], nir_imm_float(b, 0.0)));
    b->exact = false;
 
-   nir_intrinsic_instr *discard =
-      nir_intrinsic_instr_create(b->shader, nir_intrinsic_discard_if);
-   discard->src[0] = nir_src_for_ssa(cmp);
-   nir_builder_instr_insert(b, &discard->instr);
+   nir_discard_if(b, cmp);
    b->shader->info.fs.uses_discard = true;
 }