radeonsi: Scan for scoped barriers

Instead of control barriers, radeonsi doesn't see those anymore.

Fixes: 2d1859b01e ("radeonsi: always use scoped barrier")
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23191>
This commit is contained in:
Alyssa Rosenzweig 2023-06-06 16:53:46 -04:00 committed by Marge Bot
parent df51464cac
commit d64f6f2f69

View file

@ -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