aco: Split var_mem_image barrier handling from global/ssbo

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4743>
This commit is contained in:
Jason Ekstrand 2021-09-15 11:51:42 -05:00 committed by Marge Bot
parent 4c5a88d735
commit 8ab40f517f
1 changed files with 4 additions and 2 deletions

View File

@ -7080,8 +7080,10 @@ emit_scoped_barrier(isel_context* ctx, nir_intrinsic_instr* instr)
ctx->stage.hw == HWStage::CS || ctx->stage.hw == HWStage::HS || ctx->stage.hw == HWStage::NGG;
unsigned nir_storage = nir_intrinsic_memory_modes(instr);
if (nir_storage & (nir_var_mem_ssbo | nir_var_mem_global | nir_var_mem_image))
storage |= storage_buffer | storage_image; // TODO: split this when NIR gets nir_var_mem_image
if (nir_storage & (nir_var_mem_ssbo | nir_var_mem_global))
storage |= storage_buffer;
if (nir_storage & nir_var_mem_image)
storage |= storage_image;
if (shared_storage_used && (nir_storage & nir_var_mem_shared))
storage |= storage_shared;