From d983055184320a843d0f056b4c0f7af53cff47ab Mon Sep 17 00:00:00 2001 From: Jose Maria Casanova Crespo Date: Fri, 15 Nov 2019 14:46:30 +0100 Subject: v3d: Fix predication with atomic image operations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes dEQP test: dEQP-GLES31.functional.synchronization.inter_call.with_memory_barrier.image_atomic_multiple_interleaved_write_read Fixes piglit test: spec/glsl-es-3.10/execution/cs-image-atomic-if-else.shader_test Fixes: 6281f26f064ada ("v3d: Add support for shader_image_load_store.") Reviewed-by: Alejandro Piñeiro Reviewed-by: Eric Anholt --- src/broadcom/compiler/v3d40_tex.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/broadcom/compiler/v3d40_tex.c b/src/broadcom/compiler/v3d40_tex.c index 287116381fb..379f90c146a 100644 --- a/src/broadcom/compiler/v3d40_tex.c +++ b/src/broadcom/compiler/v3d40_tex.c @@ -392,9 +392,21 @@ v3d40_vir_emit_image_load_store(struct v3d_compile *c, } } + if (vir_in_nonuniform_control_flow(c) && + instr->intrinsic != nir_intrinsic_image_deref_load) { + vir_set_pf(vir_MOV_dest(c, vir_nop_reg(), c->execute), + V3D_QPU_PF_PUSHZ); + } + vir_TMU_WRITE(c, V3D_QPU_WADDR_TMUSF, ntq_get_src(c, instr->src[1], 0), &tmu_writes); + if (vir_in_nonuniform_control_flow(c) && + instr->intrinsic != nir_intrinsic_image_deref_load) { + struct qinst *last_inst= (struct qinst *)c->cur_block->instructions.prev; + vir_set_cond(last_inst, V3D_QPU_COND_IFA); + } + vir_emit_thrsw(c); /* The input FIFO has 16 slots across all threads, so make sure we -- cgit v1.2.3