vtn: Use nir_ instead of nir_build_ helpers

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23858>

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 723ac93..027bec4 100644 (file)
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -5939,13 +5939,13 @@ ray_query_load_intrinsic_create(struct vtn_builder *b, SpvOp opcode,
       struct vtn_ssa_value *ssa = vtn_create_ssa_value(b, value.glsl_type);
       for (unsigned i = 0; i < elems; i++) {
          ssa->elems[i]->def =
-            nir_build_rq_load(&b->nb,
-                              glsl_get_vector_elements(elem_type),
-                              glsl_get_bit_size(elem_type),
-                              src0,
-                              .ray_query_value = value.nir_value,
-                              .committed = committed,
-                              .column = i);
+            nir_rq_load(&b->nb,
+                        glsl_get_vector_elements(elem_type),
+                        glsl_get_bit_size(elem_type),
+                        src0,
+                        .ray_query_value = value.nir_value,
+                        .committed = committed,
+                        .column = i);
       }
 
       vtn_push_ssa_value(b, w[2], ssa);

diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 27d5ef4..8fa54df 100644 (file)
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -2683,9 +2683,9 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
       struct vtn_pointer *array = vtn_pointer_dereference(b, ptr, &chain);
 
       nir_ssa_def *array_length =
-         nir_build_deref_buffer_array_length(&b->nb, 32,
-                                             vtn_pointer_to_ssa(b, array),
-                                             .access=ptr->access | ptr->type->access);
+         nir_deref_buffer_array_length(&b->nb, 32,
+                                       vtn_pointer_to_ssa(b, array),
+                                       .access=ptr->access | ptr->type->access);
 
       vtn_push_nir_ssa(b, w[2], array_length);
       break;