Mesa (master): nir: Use nir_intrinsic_set_base in atomic lowering.

Kenneth Graunke kwg at kemper.freedesktop.org
Sat Jul 16 00:51:20 UTC 2016


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Jul 14 14:18:33 2016 -0700

nir: Use nir_intrinsic_set_base in atomic lowering.

This is more readable and also offers assertions that protect against
setting const_index fields on the wrong kind of intrinsic.

Suggested by Jason.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/compiler/nir/nir_lower_io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c
index 1708e5b..0a4de6a 100644
--- a/src/compiler/nir/nir_lower_io.c
+++ b/src/compiler/nir/nir_lower_io.c
@@ -277,9 +277,9 @@ lower_atomic(nir_intrinsic_instr *intrin, struct lower_io_state *state,
    nir_intrinsic_instr *atomic =
       nir_intrinsic_instr_create(state->mem_ctx, op);
 
-   atomic->src[0] = nir_src_for_ssa(offset);
-   atomic->const_index[0] = var->data.driver_location;
+   nir_intrinsic_set_base(atomic, var->data.driver_location);
 
+   atomic->src[0] = nir_src_for_ssa(offset);
    for (unsigned i = 0; i < nir_op_infos[intrin->intrinsic].num_inputs; i++) {
       nir_src_copy(&atomic->src[i+1], &intrin->src[i], atomic);
    }




More information about the mesa-commit mailing list