Module: Mesa Branch: master Commit: d1f6d2f3e8683f10773e7b349ab4ff6f181233a6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1f6d2f3e8683f10773e7b349ab4ff6f181233a6
Author: Caio Marcelo de Oliveira Filho <[email protected]> Date: Fri Jun 5 23:05:42 2020 -0700 nir: Fix logic that ends combine barrier sequence The combination must stop when we see a scoped barrier that have execution scope, i.e. it has control barrier behavior. The code was mistakenly looking at the wrong scope. Fixes: 345b5847b42 ("nir: Replace the scoped_memory barrier by a scoped_barrier") Reviewed-by: Boris Brezillon <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5365> --- src/compiler/nir/nir_opt_barriers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_opt_barriers.c b/src/compiler/nir/nir_opt_barriers.c index 609cbc0afdc..49ab10511f8 100644 --- a/src/compiler/nir/nir_opt_barriers.c +++ b/src/compiler/nir/nir_opt_barriers.c @@ -40,7 +40,7 @@ nir_opt_combine_memory_barriers_impl( nir_intrinsic_instr *current = nir_instr_as_intrinsic(instr); if (current->intrinsic != nir_intrinsic_scoped_barrier || - nir_intrinsic_memory_scope(current) != NIR_SCOPE_NONE) { + nir_intrinsic_execution_scope(current) != NIR_SCOPE_NONE) { prev = NULL; continue; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
