Skip to content

Commit 94e6f7b

Browse files
committed
Bytemuck now compiles on GPU 🎉
as of Lokathor/bytemuck#69 No longer depend on it conditionally
1 parent 986342d commit 94e6f7b

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

‎rust-gpu-toy/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rust-gpu-toy/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ wgpu = "0.8"
1111
winit = "0.25"
1212
pollster = "0.2"
1313
async-executor = "1.0"
14-
bytemuck = "1.5.1"
14+
bytemuck = "1.6.3"
1515
spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "c3eff4d4a5a52607aa3bc8b4ba8409f6659425ee", features = ["watch"] }
16-
rust-gpu-toy-shared = { path = "./shared", features = ["bytemuck"] }
16+
rust-gpu-toy-shared = { path = "./shared" }
1717

1818
[workspace]
1919
members = ["./shaders", "./shared"]

‎rust-gpu-toy/shared/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ description = "Definitions shared between the compute shader and the output, suc
77
edition = "2018"
88

99
[dependencies]
10-
bytemuck = { version = "1.5.1", optional = true, features = ["derive"] }
10+
bytemuck = { version = "1.6.3", features = ["derive"] }

‎rust-gpu-toy/shared/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#![no_std]
22

3-
#[cfg(feature = "bytemuck")]
43
use bytemuck::{Pod, Zeroable};
54

65
#[repr(C)]
7-
#[derive(Clone, Copy)]
8-
#[cfg_attr(feature = "bytemuck", derive(Pod, Zeroable))]
6+
#[derive(Clone, Copy, Pod, Zeroable)]
97
pub struct Config {
108
pub width: u32,
119
pub height: u32,

0 commit comments

Comments
 (0)