From 43b9dc3c53f9ec334a009e0b489b2a2cae3afa82 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 15 May 2023 09:02:57 -0400 Subject: v3dv: Lower legacy atomics earlier Signed-off-by: Alyssa Rosenzweig Reviewed-by: Emma Anholt Reviewed-by: Jesse Natalie Part-of: --- src/broadcom/vulkan/v3dv_pipeline.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index 4832e1a7e4c..3def20f37e5 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -840,16 +840,8 @@ lower_intrinsic(nir_builder *b, case nir_intrinsic_image_deref_load: case nir_intrinsic_image_deref_store: - case nir_intrinsic_image_deref_atomic_add: - case nir_intrinsic_image_deref_atomic_imin: - case nir_intrinsic_image_deref_atomic_umin: - case nir_intrinsic_image_deref_atomic_imax: - case nir_intrinsic_image_deref_atomic_umax: - case nir_intrinsic_image_deref_atomic_and: - case nir_intrinsic_image_deref_atomic_or: - case nir_intrinsic_image_deref_atomic_xor: - case nir_intrinsic_image_deref_atomic_exchange: - case nir_intrinsic_image_deref_atomic_comp_swap: + case nir_intrinsic_image_deref_atomic: + case nir_intrinsic_image_deref_atomic_swap: case nir_intrinsic_image_deref_size: case nir_intrinsic_image_deref_samples: lower_image_deref(b, instr, state); @@ -1716,6 +1708,9 @@ pipeline_lower_nir(struct v3dv_pipeline *pipeline, assert(pipeline->shared_data && pipeline->shared_data->maps[p_stage->stage]); + /* Temporary stopgap until legacy atomics are removed in core */ + NIR_PASS_V(p_stage->nir, nir_lower_legacy_atomics); + NIR_PASS_V(p_stage->nir, nir_vk_lower_ycbcr_tex, lookup_ycbcr_conversion, layout); -- cgit v1.2.1