Skip to content

Commit 2c5a198

Browse files
committed
update rust-gpu
1 parent de68005 commit 2c5a198

15 files changed

Lines changed: 41 additions & 30 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ wgpu = { version = "29.0.1", default-features = false, features = ["std", "parki
2222
pollster = "0.4.0"
2323

2424
# rust-gpu
25-
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" }
26-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" }
25+
cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
26+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
2727

2828
# other
2929
glam = { version = "0.32.0", default-features = false }

generated/graphics/ash/cargo-gpu/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ ash-window = "0.13"
2222
gpu-allocator = { version = "0.28.0", default-features = false, features = ["std", "vulkan"] }
2323

2424
# rust-gpu
25-
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" }
26-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" }
25+
# While `cargo-gpu` is backwards compatible with older rust-gpu versions, easiest is to just match the versions exactly.
26+
cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
27+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
2728

2829
# other
2930
glam = { version = "0.32.0", default-features = false }

generated/graphics/ash/cargo-gpu/mygraphics/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ pub fn main() -> anyhow::Result<()> {
99
.copied()
1010
.collect::<PathBuf>();
1111

12-
let install = Install::from_shader_crate(crate_path.clone()).run()?;
12+
let install = Install::from_shader_crate(crate_path.clone())
13+
.within_build_script()
14+
.run()?;
1315
let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3");
1416
builder.build_script.defaults = true;
1517
builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit;

generated/graphics/ash/spirv-builder/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ gpu-allocator = { version = "0.28.0", default-features = false, features = ["std
2323

2424
# rust-gpu
2525
# The version of the dependencies `spirv-builder` and `spirv-std` must match exactly!
26-
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" }
27-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" }
26+
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
27+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
2828

2929
# other
3030
glam = { version = "0.32.0", default-features = false }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2025-11-13"
2+
channel = "nightly-2026-04-11"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]

generated/graphics/wgpu/cargo-gpu/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ wgpu = { version = "29.0.1", default-features = false, features = ["std", "parki
2121
pollster = "0.4.0"
2222

2323
# rust-gpu
24-
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" }
25-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" }
24+
# While `cargo-gpu` is backwards compatible with older rust-gpu versions, easiest is to just match the versions exactly.
25+
cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
26+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
2627

2728
# other
2829
glam = { version = "0.32.0", default-features = false }

generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ pub fn main() -> anyhow::Result<()> {
99
.copied()
1010
.collect::<PathBuf>();
1111

12-
let install = Install::from_shader_crate(crate_path.clone()).run()?;
12+
let install = Install::from_shader_crate(crate_path.clone())
13+
.within_build_script()
14+
.run()?;
1315
let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3");
1416
builder.build_script.defaults = true;
1517
builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit;

generated/graphics/wgpu/spirv-builder/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ pollster = "0.4.0"
2222

2323
# rust-gpu
2424
# The version of the dependencies `spirv-builder` and `spirv-std` must match exactly!
25-
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" }
26-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" }
25+
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
26+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" }
2727

2828
# other
2929
glam = { version = "0.32.0", default-features = false }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2025-11-13"
2+
channel = "nightly-2026-04-11"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]

0 commit comments

Comments
 (0)