summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gallium/auxiliary
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2023-04-06 10:16:13 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2023-04-06 10:16:13 +0000
commita0d742befadcae89d35a2e4a5d65a85c53c886a5 (patch)
tree06ace984c944de045af3cc77e84e3da0188f1456 /lib/mesa/src/gallium/auxiliary
parentb96000c8a346b7a5b93cd0e557a59f759b81a9af (diff)
Import Mesa 22.3.7
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary')
-rw-r--r--lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_nir.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_nir.c
index 78a3c7c87..aa18851d7 100644
--- a/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_nir.c
+++ b/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_nir.c
@@ -2152,9 +2152,12 @@ visit_intrinsic(struct lp_build_nir_context *bld_base,
visit_shared_atomic(bld_base, instr, result);
break;
case nir_intrinsic_control_barrier:
- case nir_intrinsic_scoped_barrier:
visit_barrier(bld_base);
break;
+ case nir_intrinsic_scoped_barrier:
+ if (nir_intrinsic_execution_scope(instr) != NIR_SCOPE_NONE)
+ visit_barrier(bld_base);
+ break;
case nir_intrinsic_group_memory_barrier:
case nir_intrinsic_memory_barrier:
case nir_intrinsic_memory_barrier_shared: