v3d: Re-add support for memory_barrier_shared.
authorEric Anholt <eric@anholt.net>
Thu, 25 Apr 2019 18:30:39 +0000 (11:30 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 26 Apr 2019 19:42:30 +0000 (12:42 -0700)
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.")
src/broadcom/compiler/nir_to_vir.c

index 3fa2e1de953f2d172c7c85ada61165a3f02b64c4..a3484c5c67a53f63ee796c2383c128468624814d 100644 (file)
@@ -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