Bytemuck now compiles on GPU 🎉

as of Lokathor/bytemuck#69 No longer depend on it conditionally
DJMcNab · Jun 13, 2021 · 94e6f7b · 94e6f7b
1 parent 986342d
commit 94e6f7b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/rust-gpu-toy/Cargo.lock b/rust-gpu-toy/Cargo.lock
diff --git a/rust-gpu-toy/Cargo.toml b/rust-gpu-toy/Cargo.toml
@@ -11,9 +11,9 @@ wgpu = "0.8"
 winit = "0.25"
 pollster = "0.2"
 async-executor = "1.0"
-bytemuck = "1.5.1"
+bytemuck = "1.6.3"
 spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "c3eff4d4a5a52607aa3bc8b4ba8409f6659425ee", features = ["watch"] }
-rust-gpu-toy-shared = { path = "./shared", features = ["bytemuck"] }
+rust-gpu-toy-shared = { path = "./shared" }
 
 [workspace]
 members = ["./shaders", "./shared"]
diff --git a/rust-gpu-toy/shared/Cargo.toml b/rust-gpu-toy/shared/Cargo.toml
@@ -7,4 +7,4 @@ description = "Definitions shared between the compute shader and the output, suc
 edition = "2018"
 
 [dependencies]
-bytemuck = { version = "1.5.1", optional = true, features = ["derive"] }
+bytemuck = { version = "1.6.3", features = ["derive"] }
diff --git a/rust-gpu-toy/shared/src/lib.rs b/rust-gpu-toy/shared/src/lib.rs
@@ -1,11 +1,9 @@
 #![no_std]
 
-#[cfg(feature = "bytemuck")]
 use bytemuck::{Pod, Zeroable};
 
 #[repr(C)]
-#[derive(Clone, Copy)]
-#[cfg_attr(feature = "bytemuck", derive(Pod, Zeroable))]
+#[derive(Clone, Copy, Pod, Zeroable)]
 pub struct Config {
     pub width: u32,
     pub height: u32,