[Mesa-dev] [FLAG-DAY-PREP 5/9] intel: use nir_intrinsic_var() accessor

[Rob Clark]

---
 src/intel/compiler/brw_fs_nir.cpp                  | 4 ++--
 src/intel/vulkan/anv_nir_apply_pipeline_layout.c   | 2 +-
 src/intel/vulkan/anv_nir_lower_input_attachments.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp
index dbd2105f7e9..6bdabb5521e 100644
--- a/src/intel/compiler/brw_fs_nir.cpp
+++ b/src/intel/compiler/brw_fs_nir.cpp
@@ -3812,7 +3812,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
          brw_wm_prog_data(prog_data)->has_side_effects = true;
 
       /* Get the referenced image variable and type. */
-      const nir_variable *var = instr->variables[0]->var;
+      const nir_variable *var = nir_intrinsic_var(instr, 0);
       const glsl_type *type = var->type->without_array();
       const brw_reg_type base_type = get_image_base_type(type);
 
@@ -3899,7 +3899,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
 
    case nir_intrinsic_image_size: {
       /* Get the referenced image variable and type. */
-      const nir_variable *var = instr->variables[0]->var;
+      const nir_variable *var = nir_intrinsic_var(instr, 0);
       const glsl_type *type = var->type->without_array();
 
       /* Get the size of the image. */
diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
index acabc5426be..505f7b0a93b 100644
--- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
+++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
@@ -79,7 +79,7 @@ get_used_bindings_block(nir_block *block,
          case nir_intrinsic_image_atomic_comp_swap:
          case nir_intrinsic_image_size:
          case nir_intrinsic_image_samples:
-            add_var_binding(state, intrin->variables[0]->var);
+            add_var_binding(state, nir_intrinsic_var(intrin, 0));
             break;
 
          default:
diff --git a/src/intel/vulkan/anv_nir_lower_input_attachments.c b/src/intel/vulkan/anv_nir_lower_input_attachments.c
index 58b9b340a42..231ec784292 100644
--- a/src/intel/vulkan/anv_nir_lower_input_attachments.c
+++ b/src/intel/vulkan/anv_nir_lower_input_attachments.c
@@ -45,7 +45,7 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load)
 {
 
    const struct glsl_type *image_type =
-      glsl_without_array(load->variables[0]->var->type);
+      glsl_without_array(nir_intrinsic_var(load, 0)->type);
    enum glsl_sampler_dim image_dim = glsl_get_sampler_dim(image_type);
    if (image_dim != GLSL_SAMPLER_DIM_SUBPASS &&
        image_dim != GLSL_SAMPLER_DIM_SUBPASS_MS)
-- 
2.14.3