From: Eric Anholt <eric@anholt.net>
Date: Thu, 25 Apr 2019 18:30:39 +0000 (-0700)
Subject: v3d: Re-add support for memory_barrier_shared.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=575caab895d75e80d790357d68943cc78b877ea2;p=mesa.git

v3d: Re-add support for memory_barrier_shared.

Looks like I lost it in a rebase conflict resolution.  We'd hit the
unknown intrinsic assertion in
KHR-GLES31.core.compute_shader.shared-struct.

Fixes: 6b1c65982509 ("v3d: Add Compute Shader compilation support.")
---

diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c
index 3fa2e1de953..a3484c5c67a 100644
--- a/src/broadcom/compiler/nir_to_vir.c
+++ b/src/broadcom/compiler/nir_to_vir.c
@@ -1845,6 +1845,7 @@ ntq_emit_intrinsic(struct v3d_compile *c, nir_intrinsic_instr *instr)
         case nir_intrinsic_memory_barrier_atomic_counter:
         case nir_intrinsic_memory_barrier_buffer:
         case nir_intrinsic_memory_barrier_image:
+        case nir_intrinsic_memory_barrier_shared:
         case nir_intrinsic_group_memory_barrier:
                 /* We don't do any instruction scheduling of these NIR
                  * instructions between each other, so we just need to make