nir: Make nir_build_deref_offset() support ptr_as_array
authorBoris Brezillon <boris.brezillon@collabora.com>
Thu, 14 May 2020 11:18:33 +0000 (13:18 +0200)
committerMarge Bot <eric+marge@anholt.net>
Wed, 18 Nov 2020 04:05:37 +0000 (04:05 +0000)
nir_build_deref_offset() can be extended to support calculating an
offset relative to a base pointer.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7565>

src/compiler/nir/nir_deref.c

index c32731d..a5282ce 100644 (file)
@@ -334,7 +334,8 @@ nir_build_deref_offset(nir_builder *b, nir_deref_instr *deref,
    nir_ssa_def *offset = nir_imm_intN_t(b, 0, deref->dest.ssa.bit_size);
    for (nir_deref_instr **p = &path.path[1]; *p; p++) {
       switch ((*p)->deref_type) {
-      case nir_deref_type_array: {
+      case nir_deref_type_array:
+      case nir_deref_type_ptr_as_array: {
          nir_ssa_def *index = nir_ssa_for_src(b, (*p)->arr.index, 1);
          int stride = type_get_array_stride((*p)->type, size_align);
          offset = nir_iadd(b, offset, nir_amul_imm(b, index, stride));