gallivm/nir: add group barrier support

Fixes crash in
dEQP-GLES31.functional.synchronization.inter_invocation.image_write_read

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5379>

diff --git a/.gitlab-ci/deqp-virgl-fails.txt b/.gitlab-ci/deqp-virgl-fails.txt
index 32e0481d640f9b18ab9f1192d68ae8d43ec4d9f4..18d1194c4ac4493229d5ffa21be83bfb3aeb704b 100644 (file)
--- a/.gitlab-ci/deqp-virgl-fails.txt
+++ b/.gitlab-ci/deqp-virgl-fails.txt
@@ -213,8 +213,6 @@ dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.tessel
 dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.tessellation_evaluation.sampler2darray
 dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.tessellation_evaluation.usamplercube
 dEQP-GLES31.functional.shaders.opaque_type_indexing.ubo.const_expression_tessellation_evaluation
-dEQP-GLES31.functional.synchronization.inter_invocation.image_atomic_read_write
-dEQP-GLES31.functional.synchronization.inter_invocation.ssbo_atomic_read_write
 dEQP-GLES31.functional.tessellation.common_edge.quads_fractional_odd_spacing
 dEQP-GLES31.functional.tessellation.misc_draw.fill_overlap_quads_equal_spacing
 dEQP-GLES31.functional.tessellation.shader_input_output.barrier

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c
index d78aab2ef270f50030f8a4ec2bfde898538a44c6..9aa582a0e8a932f1e9695668d9552f58798cae60 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c
@@ -1459,6 +1459,7 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base,
    case nir_intrinsic_control_barrier:
       visit_barrier(bld_base);
       break;
+   case nir_intrinsic_group_memory_barrier:
    case nir_intrinsic_memory_barrier:
    case nir_intrinsic_memory_barrier_shared:
    case nir_intrinsic_memory_barrier_buffer: