Use the released version of bytemuck

Lokathor/bytemuck#69 landed That version also works 🎉
DJMcNab · Jun 13, 2021 · a2ebab2 · a2ebab2
1 parent 119fab9
commit a2ebab2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/runners/wgpu/Cargo.toml b/examples/runners/wgpu/Cargo.toml
@@ -17,13 +17,13 @@ use-compiled-tools = ["spirv-builder/use-compiled-tools"]
 
 [dependencies]
 cfg-if = "1.0.0"
-shared = { path = "../../shaders/shared", features = ["bytemuck"] }
+shared = { path = "../../shaders/shared" }
 futures = { version = "0.3", default-features = false, features = ["std", "executor"] }
 wgpu = "0.7.0"
 winit = { version = "0.24", features = ["web-sys"] }
 clap = "3.0.0-beta.2"
 strum = { version = "0.20", default_features = false, features = ["derive"] }
-bytemuck = "1.6.0"
+bytemuck = "1.6.3"
 
 [target.'cfg(not(any(target_os = "android", target_arch = "wasm32")))'.dependencies]
 spirv-builder = { path = "../../../crates/spirv-builder", default-features = false, features = ["watch"] }

diff --git a/examples/shaders/shared/Cargo.toml b/examples/shaders/shared/Cargo.toml
@@ -8,4 +8,4 @@ publish = false
 
 [dependencies]
 spirv-std = { path = "../../../crates/spirv-std", features = ["glam"] }
-bytemuck = { version = "1.6.0", features = ["derive"], optional = true }
+bytemuck = { version = "1.6.3", features = ["derive"] }
diff --git a/examples/shaders/shared/src/lib.rs b/examples/shaders/shared/src/lib.rs
@@ -12,11 +12,9 @@ pub use spirv_std::glam;
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::Float;
 
-#[cfg(feature = "bytemuck")]
 use bytemuck::{Pod, Zeroable};
 
-#[cfg_attr(feature = "bytemuck", derive(Pod, Zeroable))]
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Pod, Zeroable)]
 #[repr(C)]
 pub struct ShaderConstants {
     pub width: u32,