nir: add and use nir_intrinsic_has_ helpers

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6402>
This commit is contained in:
Rhys Perry
2020-08-20 14:01:23 +01:00
committed by Marge Bot
parent 9c1e0d86a8
commit 7530f66c16
4 changed files with 19 additions and 22 deletions

View File

@@ -910,7 +910,7 @@ build_explicit_io_load(nir_builder *b, nir_intrinsic_instr *intrin,
load->src[1] = nir_src_for_ssa(addr_to_offset(b, addr, addr_format));
}
if (nir_intrinsic_infos[op].index_map[NIR_INTRINSIC_ACCESS] > 0)
if (nir_intrinsic_has_access(load))
nir_intrinsic_set_access(load, nir_intrinsic_access(intrin));
unsigned bit_size = intrin->dest.ssa.bit_size;
@@ -1034,7 +1034,7 @@ build_explicit_io_store(nir_builder *b, nir_intrinsic_instr *intrin,
nir_intrinsic_set_write_mask(store, write_mask);
if (nir_intrinsic_infos[op].index_map[NIR_INTRINSIC_ACCESS] > 0)
if (nir_intrinsic_has_access(store))
nir_intrinsic_set_access(store, nir_intrinsic_access(intrin));
/* TODO: We should try and provide a better alignment. For OpenCL, we need
@@ -1107,7 +1107,7 @@ build_explicit_io_atomic(nir_builder *b, nir_intrinsic_instr *intrin,
/* Global atomics don't have access flags because they assume that the
* address may be non-uniform.
*/
if (nir_intrinsic_infos[op].index_map[NIR_INTRINSIC_ACCESS] > 0)
if (nir_intrinsic_has_access(atomic))
nir_intrinsic_set_access(atomic, nir_intrinsic_access(intrin));
assert(intrin->dest.ssa.num_components == 1);