From 8d0b508d91e8f873ff7974e1aad8fb6c9b8f20cf Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Fri, 29 Oct 2021 15:00:46 +0200 Subject: [PATCH] ir3: Emit barriers for images again This was accidentally broken with the nir_var_image work. Fixes: e87dbfd3 ("ir3: Check for nir_var_mem_image in shared_barrier handling") Part-of: --- src/freedreno/ir3/ir3_compiler_nir.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c index 56108ef90d9..4af7da861af 100644 --- a/src/freedreno/ir3/ir3_compiler_nir.c +++ b/src/freedreno/ir3/ir3_compiler_nir.c @@ -1428,21 +1428,22 @@ emit_intrinsic_barrier(struct ir3_context *ctx, nir_intrinsic_instr *intr) assert(!(modes & nir_var_shader_out)); if ((modes & - (nir_var_mem_shared | nir_var_mem_ssbo | nir_var_mem_global))) { + (nir_var_mem_shared | nir_var_mem_ssbo | nir_var_mem_global | + nir_var_image))) { barrier = ir3_FENCE(b); barrier->cat7.r = true; barrier->cat7.w = true; - if (modes & (nir_var_mem_ssbo | nir_var_mem_global)) { + if (modes & (nir_var_mem_ssbo | nir_var_image | nir_var_mem_global)) { barrier->cat7.g = true; } if (ctx->compiler->gen >= 6) { - if (modes & nir_var_mem_ssbo) { + if (modes & (nir_var_mem_ssbo | nir_var_image)) { barrier->cat7.l = true; } } else { - if (modes & (nir_var_mem_shared | nir_var_mem_ssbo)) { + if (modes & (nir_var_mem_shared | nir_var_mem_ssbo | nir_var_image)) { barrier->cat7.l = true; } }