From 5259bc37e62853604d29eae50d714873030ba900 Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <eddyb@lyken.rs>
Date: Mon, 5 Apr 2021 15:03:37 +0300
Subject: [PATCH] Unbreak CI (fix control_barrier and memory_barrier tests).

---
 crates/spirv-std/src/arch/barrier.rs | 5 +++--
 crates/spirv-std/src/memory.rs       | 1 +
 tests/ui/arch/control_barrier.rs     | 4 ++--
 tests/ui/arch/memory_barrier.rs      | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/crates/spirv-std/src/arch/barrier.rs b/crates/spirv-std/src/arch/barrier.rs
index a5af4d31af..56ac3c9c91 100644
--- a/crates/spirv-std/src/arch/barrier.rs
+++ b/crates/spirv-std/src/arch/barrier.rs
@@ -65,13 +65,14 @@ pub unsafe fn control_barrier<
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpMemoryBarrier")]
 #[inline]
-pub unsafe fn memory_barrier<const MEMORY: Scope, const SEMANTICS: Semantics>() {
+// FIXME(eddyb) use a `bitflags!` `Semantics` for `SEMANTICS`.
+pub unsafe fn memory_barrier<const MEMORY: Scope, const SEMANTICS: u32>() {
     asm! {
         "%u32 = OpTypeInt 32 0",
         "%memory = OpConstant %u32 {memory}",
         "%semantics = OpConstant %u32 {semantics}",
         "OpMemoryBarrier %memory %semantics",
         memory = const MEMORY as u8,
-        semantics = const SEMANTICS as u8,
+        semantics = const SEMANTICS,
     }
 }
diff --git a/crates/spirv-std/src/memory.rs b/crates/spirv-std/src/memory.rs
index 3628a99010..6bfc2e184b 100644
--- a/crates/spirv-std/src/memory.rs
+++ b/crates/spirv-std/src/memory.rs
@@ -21,6 +21,7 @@ pub enum Scope {
     QueueFamily = 5,
 }
 
+// FIXME(eddyb) use `bitflags!` for this.
 #[derive(Debug, PartialEq, Eq)]
 pub enum Semantics {
     /// No memory semantics.
diff --git a/tests/ui/arch/control_barrier.rs b/tests/ui/arch/control_barrier.rs
index c143af7dd0..c1f9d559f2 100644
--- a/tests/ui/arch/control_barrier.rs
+++ b/tests/ui/arch/control_barrier.rs
@@ -9,8 +9,8 @@ use spirv_std::memory::{Scope, Semantics};
 pub fn main() {
     unsafe {
         spirv_std::arch::control_barrier::<
-            { Scope::Workgroup },
-            { Scope::Workgroup },
+            { Scope::Subgroup },
+            { Scope::Subgroup },
             { Semantics::None },
         >();
     }
diff --git a/tests/ui/arch/memory_barrier.rs b/tests/ui/arch/memory_barrier.rs
index 2e2508f38c..97810ba135 100644
--- a/tests/ui/arch/memory_barrier.rs
+++ b/tests/ui/arch/memory_barrier.rs
@@ -9,8 +9,8 @@ use spirv_std::memory::{Scope, Semantics};
 pub fn main() {
     unsafe {
         spirv_std::arch::memory_barrier::<
-            { Scope::Workgroup },
-            { Semantics::None },
+            { Scope::Subgroup },
+            { (Semantics::AcquireRelease as u32) | (Semantics::UniformMemory as u32) },
         >();
     }
 }