From 4bc4feefd2f73f62fbfb759e4e9f38a51ddc1d1a Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 14 Apr 2026 11:01:17 +0200 Subject: [PATCH 1/3] update rust-gpu --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 4 ++-- generated/graphics/ash/cargo-gpu/Cargo.toml | 5 +++-- .../graphics/ash/cargo-gpu/mygraphics/build.rs | 4 +++- .../graphics/ash/spirv-builder/Cargo.toml | 4 ++-- .../ash/spirv-builder/rust-toolchain.toml | 2 +- generated/graphics/wgpu/cargo-gpu/Cargo.toml | 5 +++-- .../wgpu/cargo-gpu/mygraphics/build.rs | 4 +++- .../graphics/wgpu/spirv-builder/Cargo.toml | 4 ++-- .../wgpu/spirv-builder/rust-toolchain.toml | 2 +- graphics/Cargo.toml.liquid | 7 ++++--- graphics/mygraphics/build.rs | 4 +++- graphics/mygraphics/build.rs.liquid | 4 +++- graphics/rust-toolchain.toml | 2 +- rust-toolchain.toml | 2 +- 15 files changed, 41 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d834862..b6ed8fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -404,8 +404,8 @@ dependencies = [ [[package]] name = "cargo-gpu" -version = "0.1.0" -source = "git+https://github.com/Rust-GPU/cargo-gpu?rev=7f1995823a82ee6e6b7a63b57313c4a829856e3d#7f1995823a82ee6e6b7a63b57313c4a829856e3d" +version = "0.9.0" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515761da7ef24fcbeb#8494942c0be705049514c2515761da7ef24fcbeb" dependencies = [ "anyhow", "cargo-gpu-install", @@ -422,8 +422,8 @@ dependencies = [ [[package]] name = "cargo-gpu-install" -version = "0.1.0" -source = "git+https://github.com/Rust-GPU/cargo-gpu?rev=7f1995823a82ee6e6b7a63b57313c4a829856e3d#7f1995823a82ee6e6b7a63b57313c4a829856e3d" +version = "0.9.0" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515761da7ef24fcbeb#8494942c0be705049514c2515761da7ef24fcbeb" dependencies = [ "anyhow", "cargo_metadata", @@ -3107,7 +3107,7 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_codegen_spirv-types" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=6a67e7b5954f37989ad540a555b5d6969073592e#6a67e7b5954f37989ad540a555b5d6969073592e" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515761da7ef24fcbeb#8494942c0be705049514c2515761da7ef24fcbeb" dependencies = [ "rspirv", "semver", @@ -3464,7 +3464,7 @@ dependencies = [ [[package]] name = "spirv-builder" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=6a67e7b5954f37989ad540a555b5d6969073592e#6a67e7b5954f37989ad540a555b5d6969073592e" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515761da7ef24fcbeb#8494942c0be705049514c2515761da7ef24fcbeb" dependencies = [ "cargo_metadata", "clap", @@ -3482,7 +3482,7 @@ dependencies = [ [[package]] name = "spirv-std" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=30896871ba00e668029ccb724f1438202b284708#30896871ba00e668029ccb724f1438202b284708" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515761da7ef24fcbeb#8494942c0be705049514c2515761da7ef24fcbeb" dependencies = [ "bitflags 1.3.2", "glam", @@ -3495,7 +3495,7 @@ dependencies = [ [[package]] name = "spirv-std-macros" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=30896871ba00e668029ccb724f1438202b284708#30896871ba00e668029ccb724f1438202b284708" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515761da7ef24fcbeb#8494942c0be705049514c2515761da7ef24fcbeb" dependencies = [ "proc-macro2", "quote", @@ -3506,7 +3506,7 @@ dependencies = [ [[package]] name = "spirv-std-types" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=30896871ba00e668029ccb724f1438202b284708#30896871ba00e668029ccb724f1438202b284708" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515761da7ef24fcbeb#8494942c0be705049514c2515761da7ef24fcbeb" [[package]] name = "stable_deref_trait" diff --git a/Cargo.toml b/Cargo.toml index a83ce41..506eeb8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,8 @@ wgpu = { version = "29.0.1", default-features = false, features = ["std", "parki pollster = "0.4.0" # rust-gpu -cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } +cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } # other glam = { version = "0.32.0", default-features = false } diff --git a/generated/graphics/ash/cargo-gpu/Cargo.toml b/generated/graphics/ash/cargo-gpu/Cargo.toml index d14c222..14feac8 100644 --- a/generated/graphics/ash/cargo-gpu/Cargo.toml +++ b/generated/graphics/ash/cargo-gpu/Cargo.toml @@ -22,8 +22,9 @@ ash-window = "0.13" gpu-allocator = { version = "0.28.0", default-features = false, features = ["std", "vulkan"] } # rust-gpu -cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } +# While `cargo-gpu` is backwards compatible with older rust-gpu versions, easiest is to just match the versions exactly. +cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } # other glam = { version = "0.32.0", default-features = false } diff --git a/generated/graphics/ash/cargo-gpu/mygraphics/build.rs b/generated/graphics/ash/cargo-gpu/mygraphics/build.rs index 0c7571c..5b62020 100644 --- a/generated/graphics/ash/cargo-gpu/mygraphics/build.rs +++ b/generated/graphics/ash/cargo-gpu/mygraphics/build.rs @@ -9,7 +9,9 @@ pub fn main() -> anyhow::Result<()> { .copied() .collect::(); - let install = Install::from_shader_crate(crate_path.clone()).run()?; + let install = Install::from_shader_crate(crate_path.clone()) + .within_build_script() + .run()?; let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3"); builder.build_script.defaults = true; builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit; diff --git a/generated/graphics/ash/spirv-builder/Cargo.toml b/generated/graphics/ash/spirv-builder/Cargo.toml index 3e2d877..40f4f86 100644 --- a/generated/graphics/ash/spirv-builder/Cargo.toml +++ b/generated/graphics/ash/spirv-builder/Cargo.toml @@ -23,8 +23,8 @@ gpu-allocator = { version = "0.28.0", default-features = false, features = ["std # rust-gpu # The version of the dependencies `spirv-builder` and `spirv-std` must match exactly! -spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } +spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } # other glam = { version = "0.32.0", default-features = false } diff --git a/generated/graphics/ash/spirv-builder/rust-toolchain.toml b/generated/graphics/ash/spirv-builder/rust-toolchain.toml index df80c0c..907dd5e 100644 --- a/generated/graphics/ash/spirv-builder/rust-toolchain.toml +++ b/generated/graphics/ash/spirv-builder/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-11-13" +channel = "nightly-2026-04-11" components = ["rust-src", "rustc-dev", "llvm-tools"] diff --git a/generated/graphics/wgpu/cargo-gpu/Cargo.toml b/generated/graphics/wgpu/cargo-gpu/Cargo.toml index 0574a94..66abd99 100644 --- a/generated/graphics/wgpu/cargo-gpu/Cargo.toml +++ b/generated/graphics/wgpu/cargo-gpu/Cargo.toml @@ -21,8 +21,9 @@ wgpu = { version = "29.0.1", default-features = false, features = ["std", "parki pollster = "0.4.0" # rust-gpu -cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } +# While `cargo-gpu` is backwards compatible with older rust-gpu versions, easiest is to just match the versions exactly. +cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } # other glam = { version = "0.32.0", default-features = false } diff --git a/generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs b/generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs index 0c7571c..5b62020 100644 --- a/generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs +++ b/generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs @@ -9,7 +9,9 @@ pub fn main() -> anyhow::Result<()> { .copied() .collect::(); - let install = Install::from_shader_crate(crate_path.clone()).run()?; + let install = Install::from_shader_crate(crate_path.clone()) + .within_build_script() + .run()?; let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3"); builder.build_script.defaults = true; builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit; diff --git a/generated/graphics/wgpu/spirv-builder/Cargo.toml b/generated/graphics/wgpu/spirv-builder/Cargo.toml index 278b86d..eb66518 100644 --- a/generated/graphics/wgpu/spirv-builder/Cargo.toml +++ b/generated/graphics/wgpu/spirv-builder/Cargo.toml @@ -22,8 +22,8 @@ pollster = "0.4.0" # rust-gpu # The version of the dependencies `spirv-builder` and `spirv-std` must match exactly! -spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } +spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } # other glam = { version = "0.32.0", default-features = false } diff --git a/generated/graphics/wgpu/spirv-builder/rust-toolchain.toml b/generated/graphics/wgpu/spirv-builder/rust-toolchain.toml index df80c0c..907dd5e 100644 --- a/generated/graphics/wgpu/spirv-builder/rust-toolchain.toml +++ b/generated/graphics/wgpu/spirv-builder/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-11-13" +channel = "nightly-2026-04-11" components = ["rust-src", "rustc-dev", "llvm-tools"] diff --git a/graphics/Cargo.toml.liquid b/graphics/Cargo.toml.liquid index 2c0ee0c..3adf8de 100644 --- a/graphics/Cargo.toml.liquid +++ b/graphics/Cargo.toml.liquid @@ -30,12 +30,13 @@ pollster = "0.4.0" # rust-gpu {% if integration == "spirv-builder" -%} # The version of the dependencies `spirv-builder` and `spirv-std` must match exactly! -spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } +spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } {% endif -%} {% if integration == "cargo-gpu" -%} -cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" } +# While `cargo-gpu` is backwards compatible with older rust-gpu versions, easiest is to just match the versions exactly. +cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } {% endif -%} -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } # other glam = { version = "0.32.0", default-features = false } diff --git a/graphics/mygraphics/build.rs b/graphics/mygraphics/build.rs index 0c7571c..5b62020 100644 --- a/graphics/mygraphics/build.rs +++ b/graphics/mygraphics/build.rs @@ -9,7 +9,9 @@ pub fn main() -> anyhow::Result<()> { .copied() .collect::(); - let install = Install::from_shader_crate(crate_path.clone()).run()?; + let install = Install::from_shader_crate(crate_path.clone()) + .within_build_script() + .run()?; let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3"); builder.build_script.defaults = true; builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit; diff --git a/graphics/mygraphics/build.rs.liquid b/graphics/mygraphics/build.rs.liquid index 42b2fc3..5443d14 100644 --- a/graphics/mygraphics/build.rs.liquid +++ b/graphics/mygraphics/build.rs.liquid @@ -18,7 +18,9 @@ pub fn main() -> anyhow::Result<()> { let mut builder = SpirvBuilder::new(crate_path, "spirv-unknown-vulkan1.3"); {% endif -%} {% if integration == "cargo-gpu" -%} - let install = Install::from_shader_crate(crate_path.clone()).run()?; + let install = Install::from_shader_crate(crate_path.clone()) + .within_build_script() + .run()?; let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3"); {% endif -%} builder.build_script.defaults = true; diff --git a/graphics/rust-toolchain.toml b/graphics/rust-toolchain.toml index df80c0c..907dd5e 100644 --- a/graphics/rust-toolchain.toml +++ b/graphics/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-11-13" +channel = "nightly-2026-04-11" components = ["rust-src", "rustc-dev", "llvm-tools"] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index df80c0c..907dd5e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-11-13" +channel = "nightly-2026-04-11" components = ["rust-src", "rustc-dev", "llvm-tools"] From 483572f242ee68a93a15feba9ecbb7111d4c5bd8 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 14 Apr 2026 15:24:37 +0200 Subject: [PATCH 2/3] fix new clippy lints --- generated/graphics/ash/cargo-gpu/mygraphics/src/util.rs | 4 +--- generated/graphics/ash/spirv-builder/mygraphics/src/util.rs | 4 +--- generated/graphics/wgpu/cargo-gpu/mygraphics/src/util.rs | 4 +--- generated/graphics/wgpu/spirv-builder/mygraphics/src/util.rs | 4 +--- graphics/mygraphics/src/util.rs | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/generated/graphics/ash/cargo-gpu/mygraphics/src/util.rs b/generated/graphics/ash/cargo-gpu/mygraphics/src/util.rs index 5541594..deac204 100644 --- a/generated/graphics/ash/cargo-gpu/mygraphics/src/util.rs +++ b/generated/graphics/ash/cargo-gpu/mygraphics/src/util.rs @@ -1,5 +1,3 @@ pub fn enable_debug_layer() -> bool { - std::env::var("DEBUG_LAYER") - .map(|e| !(e == "0" || e == "false")) - .unwrap_or(false) + std::env::var("DEBUG_LAYER").is_ok_and(|e| !(e == "0" || e == "false")) } diff --git a/generated/graphics/ash/spirv-builder/mygraphics/src/util.rs b/generated/graphics/ash/spirv-builder/mygraphics/src/util.rs index 5541594..deac204 100644 --- a/generated/graphics/ash/spirv-builder/mygraphics/src/util.rs +++ b/generated/graphics/ash/spirv-builder/mygraphics/src/util.rs @@ -1,5 +1,3 @@ pub fn enable_debug_layer() -> bool { - std::env::var("DEBUG_LAYER") - .map(|e| !(e == "0" || e == "false")) - .unwrap_or(false) + std::env::var("DEBUG_LAYER").is_ok_and(|e| !(e == "0" || e == "false")) } diff --git a/generated/graphics/wgpu/cargo-gpu/mygraphics/src/util.rs b/generated/graphics/wgpu/cargo-gpu/mygraphics/src/util.rs index 5541594..deac204 100644 --- a/generated/graphics/wgpu/cargo-gpu/mygraphics/src/util.rs +++ b/generated/graphics/wgpu/cargo-gpu/mygraphics/src/util.rs @@ -1,5 +1,3 @@ pub fn enable_debug_layer() -> bool { - std::env::var("DEBUG_LAYER") - .map(|e| !(e == "0" || e == "false")) - .unwrap_or(false) + std::env::var("DEBUG_LAYER").is_ok_and(|e| !(e == "0" || e == "false")) } diff --git a/generated/graphics/wgpu/spirv-builder/mygraphics/src/util.rs b/generated/graphics/wgpu/spirv-builder/mygraphics/src/util.rs index 5541594..deac204 100644 --- a/generated/graphics/wgpu/spirv-builder/mygraphics/src/util.rs +++ b/generated/graphics/wgpu/spirv-builder/mygraphics/src/util.rs @@ -1,5 +1,3 @@ pub fn enable_debug_layer() -> bool { - std::env::var("DEBUG_LAYER") - .map(|e| !(e == "0" || e == "false")) - .unwrap_or(false) + std::env::var("DEBUG_LAYER").is_ok_and(|e| !(e == "0" || e == "false")) } diff --git a/graphics/mygraphics/src/util.rs b/graphics/mygraphics/src/util.rs index 5541594..deac204 100644 --- a/graphics/mygraphics/src/util.rs +++ b/graphics/mygraphics/src/util.rs @@ -1,5 +1,3 @@ pub fn enable_debug_layer() -> bool { - std::env::var("DEBUG_LAYER") - .map(|e| !(e == "0" || e == "false")) - .unwrap_or(false) + std::env::var("DEBUG_LAYER").is_ok_and(|e| !(e == "0" || e == "false")) } From 02418503c53d40fdab6e7c42a108ae0a7db51078 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 14 Apr 2026 15:03:04 +0200 Subject: [PATCH 3/3] switch to `cargo-gpu-install` crate --- Cargo.lock | 278 +----------------- Cargo.toml | 2 +- generated/graphics/ash/cargo-gpu/Cargo.toml | 2 +- .../ash/cargo-gpu/mygraphics/Cargo.toml | 2 +- .../ash/cargo-gpu/mygraphics/build.rs | 4 +- generated/graphics/wgpu/cargo-gpu/Cargo.toml | 2 +- .../wgpu/cargo-gpu/mygraphics/Cargo.toml | 2 +- .../wgpu/cargo-gpu/mygraphics/build.rs | 4 +- graphics/Cargo.toml.liquid | 2 +- graphics/mygraphics/Cargo.toml | 2 +- graphics/mygraphics/Cargo.toml.liquid | 2 +- graphics/mygraphics/build.rs | 4 +- graphics/mygraphics/build.rs.liquid | 4 +- 13 files changed, 27 insertions(+), 283 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b6ed8fb..f672fe9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -402,24 +402,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "cargo-gpu" -version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515761da7ef24fcbeb#8494942c0be705049514c2515761da7ef24fcbeb" -dependencies = [ - "anyhow", - "cargo-gpu-install", - "cargo_metadata", - "clap", - "dunce", - "env_logger", - "log", - "relative-path", - "semver", - "serde", - "serde_json", -] - [[package]] name = "cargo-gpu-install" version = "0.9.0" @@ -427,8 +409,6 @@ source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515 dependencies = [ "anyhow", "cargo_metadata", - "clap", - "crossterm", "directories", "log", "serde", @@ -728,32 +708,6 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "crossterm" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" -dependencies = [ - "bitflags 2.11.1", - "crossterm_winapi", - "document-features", - "mio", - "parking_lot", - "rustix 1.1.4", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - [[package]] name = "crunchy" version = "0.2.4" @@ -903,12 +857,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "either" version = "1.15.0" @@ -1070,15 +1018,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - [[package]] name = "futures-core" version = "0.3.32" @@ -1701,26 +1640,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "inotify" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199" -dependencies = [ - "bitflags 2.11.1", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - [[package]] name = "instant" version = "0.1.13" @@ -1872,26 +1791,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kqueue" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - [[package]] name = "kstring" version = "2.0.2" @@ -2099,18 +1998,6 @@ dependencies = [ "libc", ] -[[package]] -name = "mio" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.61.2", -] - [[package]] name = "mygraphics" version = "0.1.0" @@ -2119,7 +2006,7 @@ dependencies = [ "ash", "ash-window", "bytemuck", - "cargo-gpu", + "cargo-gpu-install", "env_logger", "gpu-allocator", "mygraphics-shaders", @@ -2225,33 +2112,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "notify" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" -dependencies = [ - "bitflags 2.11.1", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "notify-types", - "walkdir", - "windows-sys 0.60.2", -] - -[[package]] -name = "notify-types" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" -dependencies = [ - "bitflags 2.11.1", -] - [[package]] name = "num-conv" version = "0.2.1" @@ -3031,15 +2891,6 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" -[[package]] -name = "relative-path" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca40a312222d8ba74837cb474edef44b37f561da5f773981007a10bbaa992b0" -dependencies = [ - "serde", -] - [[package]] name = "remove_dir_all" version = "1.0.0" @@ -3338,37 +3189,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signal-hook" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" -dependencies = [ - "errno", - "libc", -] - [[package]] name = "simd_cesu8" version = "1.1.1" @@ -3467,10 +3287,8 @@ version = "0.9.0" source = "git+https://github.com/Rust-GPU/rust-gpu?rev=8494942c0be705049514c2515761da7ef24fcbeb#8494942c0be705049514c2515761da7ef24fcbeb" dependencies = [ "cargo_metadata", - "clap", "log", "memchr", - "notify", "raw-string", "rustc_codegen_spirv-types", "semver", @@ -4483,7 +4301,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -4492,16 +4310,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -4519,31 +4328,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -4561,96 +4353,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winit" version = "0.30.13" diff --git a/Cargo.toml b/Cargo.toml index 506eeb8..24d9291 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ wgpu = { version = "29.0.1", default-features = false, features = ["std", "parki pollster = "0.4.0" # rust-gpu -cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } +cargo-gpu-install = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } # other diff --git a/generated/graphics/ash/cargo-gpu/Cargo.toml b/generated/graphics/ash/cargo-gpu/Cargo.toml index 14feac8..774f3d4 100644 --- a/generated/graphics/ash/cargo-gpu/Cargo.toml +++ b/generated/graphics/ash/cargo-gpu/Cargo.toml @@ -23,7 +23,7 @@ gpu-allocator = { version = "0.28.0", default-features = false, features = ["std # rust-gpu # While `cargo-gpu` is backwards compatible with older rust-gpu versions, easiest is to just match the versions exactly. -cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } +cargo-gpu-install = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } # other diff --git a/generated/graphics/ash/cargo-gpu/mygraphics/Cargo.toml b/generated/graphics/ash/cargo-gpu/mygraphics/Cargo.toml index 7137e96..e84a3a1 100644 --- a/generated/graphics/ash/cargo-gpu/mygraphics/Cargo.toml +++ b/generated/graphics/ash/cargo-gpu/mygraphics/Cargo.toml @@ -27,7 +27,7 @@ bytemuck.workspace = true [build-dependencies] # rust-gpu -cargo-gpu.workspace = true +cargo-gpu-install.workspace = true # other anyhow.workspace = true diff --git a/generated/graphics/ash/cargo-gpu/mygraphics/build.rs b/generated/graphics/ash/cargo-gpu/mygraphics/build.rs index 5b62020..64aa839 100644 --- a/generated/graphics/ash/cargo-gpu/mygraphics/build.rs +++ b/generated/graphics/ash/cargo-gpu/mygraphics/build.rs @@ -1,5 +1,5 @@ -use cargo_gpu::install::Install; -use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata}; +use cargo_gpu_install::install::Install; +use cargo_gpu_install::spirv_builder::{ShaderPanicStrategy, SpirvMetadata}; use std::path::PathBuf; pub fn main() -> anyhow::Result<()> { diff --git a/generated/graphics/wgpu/cargo-gpu/Cargo.toml b/generated/graphics/wgpu/cargo-gpu/Cargo.toml index 66abd99..de934ee 100644 --- a/generated/graphics/wgpu/cargo-gpu/Cargo.toml +++ b/generated/graphics/wgpu/cargo-gpu/Cargo.toml @@ -22,7 +22,7 @@ pollster = "0.4.0" # rust-gpu # While `cargo-gpu` is backwards compatible with older rust-gpu versions, easiest is to just match the versions exactly. -cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } +cargo-gpu-install = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } # other diff --git a/generated/graphics/wgpu/cargo-gpu/mygraphics/Cargo.toml b/generated/graphics/wgpu/cargo-gpu/mygraphics/Cargo.toml index 1349391..b5b67ef 100644 --- a/generated/graphics/wgpu/cargo-gpu/mygraphics/Cargo.toml +++ b/generated/graphics/wgpu/cargo-gpu/mygraphics/Cargo.toml @@ -27,7 +27,7 @@ bytemuck.workspace = true [build-dependencies] # rust-gpu -cargo-gpu.workspace = true +cargo-gpu-install.workspace = true # other anyhow.workspace = true diff --git a/generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs b/generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs index 5b62020..64aa839 100644 --- a/generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs +++ b/generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs @@ -1,5 +1,5 @@ -use cargo_gpu::install::Install; -use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata}; +use cargo_gpu_install::install::Install; +use cargo_gpu_install::spirv_builder::{ShaderPanicStrategy, SpirvMetadata}; use std::path::PathBuf; pub fn main() -> anyhow::Result<()> { diff --git a/graphics/Cargo.toml.liquid b/graphics/Cargo.toml.liquid index 3adf8de..e8af8a5 100644 --- a/graphics/Cargo.toml.liquid +++ b/graphics/Cargo.toml.liquid @@ -34,7 +34,7 @@ spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0 {% endif -%} {% if integration == "cargo-gpu" -%} # While `cargo-gpu` is backwards compatible with older rust-gpu versions, easiest is to just match the versions exactly. -cargo-gpu = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } +cargo-gpu-install = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } {% endif -%} spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "8494942c0be705049514c2515761da7ef24fcbeb" } diff --git a/graphics/mygraphics/Cargo.toml b/graphics/mygraphics/Cargo.toml index 84b21f5..faca44f 100644 --- a/graphics/mygraphics/Cargo.toml +++ b/graphics/mygraphics/Cargo.toml @@ -30,7 +30,7 @@ bytemuck.workspace = true [build-dependencies] # rust-gpu -cargo-gpu.workspace = true +cargo-gpu-install.workspace = true # other anyhow.workspace = true diff --git a/graphics/mygraphics/Cargo.toml.liquid b/graphics/mygraphics/Cargo.toml.liquid index 8667745..2174d76 100644 --- a/graphics/mygraphics/Cargo.toml.liquid +++ b/graphics/mygraphics/Cargo.toml.liquid @@ -45,7 +45,7 @@ bytemuck.workspace = true spirv-builder.workspace = true {%- endif -%} {%- if integration == "cargo-gpu" -%} -cargo-gpu.workspace = true +cargo-gpu-install.workspace = true {%- endif %} # other diff --git a/graphics/mygraphics/build.rs b/graphics/mygraphics/build.rs index 5b62020..64aa839 100644 --- a/graphics/mygraphics/build.rs +++ b/graphics/mygraphics/build.rs @@ -1,5 +1,5 @@ -use cargo_gpu::install::Install; -use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata}; +use cargo_gpu_install::install::Install; +use cargo_gpu_install::spirv_builder::{ShaderPanicStrategy, SpirvMetadata}; use std::path::PathBuf; pub fn main() -> anyhow::Result<()> { diff --git a/graphics/mygraphics/build.rs.liquid b/graphics/mygraphics/build.rs.liquid index 5443d14..16d4181 100644 --- a/graphics/mygraphics/build.rs.liquid +++ b/graphics/mygraphics/build.rs.liquid @@ -2,8 +2,8 @@ use spirv_builder::{ShaderPanicStrategy, SpirvBuilder, SpirvMetadata}; {% endif -%} {% if integration == "cargo-gpu" -%} -use cargo_gpu::install::Install; -use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata}; +use cargo_gpu_install::install::Install; +use cargo_gpu_install::spirv_builder::{ShaderPanicStrategy, SpirvMetadata}; {% endif -%} use std::path::PathBuf;