From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 14 Jul 2016 21:18:33 +0000 (-0700)
Subject: nir: Use nir_intrinsic_set_base in atomic lowering.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=52e75dcb8c04c0dde989970c4c587cbe8313f7cf;p=mesa.git

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@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c
index 1708e5b77e6..0a4de6a2d01 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);
    }