From d64f6f2f695d8a0a88be78b83a4ab09cb2ba810b Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 6 Jun 2023 16:53:46 -0400 Subject: [PATCH] radeonsi: Scan for scoped barriers Instead of control barriers, radeonsi doesn't see those anymore. Fixes: 2d1859b01e3 ("radeonsi: always use scoped barrier") Signed-off-by: Alyssa Rosenzweig Reviewed-by: Caio Oliveira Reviewed-by: Jesse Natalie Part-of: --- src/gallium/drivers/radeonsi/si_shader_info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_shader_info.c b/src/gallium/drivers/radeonsi/si_shader_info.c index 126be56145f..25953d59919 100644 --- a/src/gallium/drivers/radeonsi/si_shader_info.c +++ b/src/gallium/drivers/radeonsi/si_shader_info.c @@ -69,7 +69,8 @@ static void scan_tess_ctrl(nir_cf_node *cf_node, unsigned *upper_block_tf_writem continue; nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr); - if (intrin->intrinsic == nir_intrinsic_control_barrier) { + if (intrin->intrinsic == nir_intrinsic_scoped_barrier && + nir_intrinsic_execution_scope(intrin) >= NIR_SCOPE_WORKGROUP) { /* If we find a barrier in nested control flow put this in the * too hard basket. In GLSL this is not possible but it is in