OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavapipe: Don't delete control barriers

Browse Source 
Control barriers still need to do synchronization even if there are no
associated memory barrier modes.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24842>
This commit is contained in:
Kenneth Graunke
2023-08-31 15:29:54 -07:00
committed by Marge Bot
parent fc0aaa81ee
commit dd92fd8fcc
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/frontends/lavapipe/lvp_pipeline.c
View File

@@ -138,6 +138,9 @@ remove_barriers_impl(nir_builder *b, nir_intrinsic_instr *intr, void *data)
if (intr->intrinsic != nir_intrinsic_barrier) if (intr->intrinsic != nir_intrinsic_barrier)
return false; return false;
if (data) { if (data) {
if (nir_intrinsic_execution_scope(intr) != SCOPE_NONE)
return false;
if (nir_intrinsic_memory_scope(intr) == SCOPE_WORKGROUP || if (nir_intrinsic_memory_scope(intr) == SCOPE_WORKGROUP ||
nir_intrinsic_memory_scope(intr) == SCOPE_DEVICE || nir_intrinsic_memory_scope(intr) == SCOPE_DEVICE ||
nir_intrinsic_memory_scope(intr) == SCOPE_QUEUE_FAMILY) nir_intrinsic_memory_scope(intr) == SCOPE_QUEUE_FAMILY)