Mesa (master): gallivm/nir: add group barrier support

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f6ce962f00fb31b28f455d19ce4d8192ecaeb694
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f6ce962f00fb31b28f455d19ce4d8192ecaeb694

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Mar 27 15:27:41 2020 +1000

gallivm/nir: add group barrier support

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

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

---

 .gitlab-ci/deqp-virgl-fails.txt            | 2 --
 src/gallium/auxiliary/gallivm/lp_bld_nir.c | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci/deqp-virgl-fails.txt b/.gitlab-ci/deqp-virgl-fails.txt
index 32e0481d640..18d1194c4ac 100644
--- 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 d78aab2ef27..9aa582a0e8a 100644
--- 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: