[Mesa-dev] [FLAG-DAY-PREP 2/9] freedreno/ir3: use nir_intrinsic_var() accessor

[Rob Clark]

---
 src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c | 8 ++++----
 src/gallium/drivers/freedreno/ir3/ir3_nir.c          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c 
b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
index 1d6403b5260..0492c67418f 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
@@ -1726,7 +1726,7 @@ emit_intrinsic_load_image(struct ir3_context *ctx, 
nir_intrinsic_instr *intr,
                struct ir3_instruction **dst)
 {
        struct ir3_block *b = ctx->block;
-       const nir_variable *var = intr->variables[0]->var;
+       const nir_variable *var = nir_intrinsic_var(intr, 0);
        struct ir3_instruction *sam;
        struct ir3_instruction * const *coords = get_src(ctx, &intr->src[0]);
        unsigned ncoords = get_image_coords(var);
@@ -1751,7 +1751,7 @@ static void
 emit_intrinsic_store_image(struct ir3_context *ctx, nir_intrinsic_instr *intr)
 {
        struct ir3_block *b = ctx->block;
-       const nir_variable *var = intr->variables[0]->var;
+       const nir_variable *var = nir_intrinsic_var(intr, 0);
        struct ir3_instruction *stib, *offset;
        struct ir3_instruction * const *value = get_src(ctx, &intr->src[2]);
        struct ir3_instruction * const *coords = get_src(ctx, &intr->src[0]);
@@ -1789,7 +1789,7 @@ emit_intrinsic_image_size(struct ir3_context *ctx, 
nir_intrinsic_instr *intr,
                struct ir3_instruction **dst)
 {
        struct ir3_block *b = ctx->block;
-       const nir_variable *var = intr->variables[0]->var;
+       const nir_variable *var = nir_intrinsic_var(intr, 0);
        unsigned ncoords = get_image_coords(var);
        unsigned tex_idx = get_image_slot(ctx, var);
        struct ir3_instruction *sam, *lod;
@@ -1810,7 +1810,7 @@ static struct ir3_instruction *
 emit_intrinsic_atomic_image(struct ir3_context *ctx, nir_intrinsic_instr *intr)
 {
        struct ir3_block *b = ctx->block;
-       const nir_variable *var = intr->variables[0]->var;
+       const nir_variable *var = nir_intrinsic_var(intr, 0);
        struct ir3_instruction *atomic, *image, *src0, *src1, *src2;
        struct ir3_instruction * const *coords = get_src(ctx, &intr->src[0]);
        unsigned ncoords = get_image_coords(var);
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir.c 
b/src/gallium/drivers/freedreno/ir3/ir3_nir.c
index 0b637bb99bd..60866f9a9dc 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_nir.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.c
@@ -243,7 +243,7 @@ ir3_nir_scan_driver_consts(nir_shader *shader,
                                        layout->ssbo_size.count += 1; /* one 
const per */
                                        break;
                                case nir_intrinsic_image_store:
-                                       idx = 
intr->variables[0]->var->data.driver_location;
+                                       idx = nir_intrinsic_var(intr, 
0)->data.driver_location;
                                        if (layout->image_dims.mask & (1 << 
idx))
                                                break;
                                        layout->image_dims.mask |= (1 << idx);
-- 
2.14.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev