Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
292 changes: 18 additions & 274 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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-install = { 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 }
Expand Down
5 changes: 3 additions & 2 deletions generated/graphics/ash/cargo-gpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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-install = { 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 }
Expand Down
2 changes: 1 addition & 1 deletion generated/graphics/ash/cargo-gpu/mygraphics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ bytemuck.workspace = true

[build-dependencies]
# rust-gpu
cargo-gpu.workspace = true
cargo-gpu-install.workspace = true

# other
anyhow.workspace = true
8 changes: 5 additions & 3 deletions generated/graphics/ash/cargo-gpu/mygraphics/build.rs
Original file line number Diff line number Diff line change
@@ -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<()> {
Expand All @@ -9,7 +9,9 @@ pub fn main() -> anyhow::Result<()> {
.copied()
.collect::<PathBuf>();

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;
Expand Down
4 changes: 1 addition & 3 deletions generated/graphics/ash/cargo-gpu/mygraphics/src/util.rs
Original file line number Diff line number Diff line change
@@ -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"))
}
4 changes: 2 additions & 2 deletions generated/graphics/ash/spirv-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
@@ -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"))
}
2 changes: 1 addition & 1 deletion generated/graphics/ash/spirv-builder/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2025-11-13"
channel = "nightly-2026-04-11"
components = ["rust-src", "rustc-dev", "llvm-tools"]
5 changes: 3 additions & 2 deletions generated/graphics/wgpu/cargo-gpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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-install = { 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 }
Expand Down
2 changes: 1 addition & 1 deletion generated/graphics/wgpu/cargo-gpu/mygraphics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ bytemuck.workspace = true

[build-dependencies]
# rust-gpu
cargo-gpu.workspace = true
cargo-gpu-install.workspace = true

# other
anyhow.workspace = true
8 changes: 5 additions & 3 deletions generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs
Original file line number Diff line number Diff line change
@@ -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<()> {
Expand All @@ -9,7 +9,9 @@ pub fn main() -> anyhow::Result<()> {
.copied()
.collect::<PathBuf>();

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;
Expand Down
4 changes: 1 addition & 3 deletions generated/graphics/wgpu/cargo-gpu/mygraphics/src/util.rs
Original file line number Diff line number Diff line change
@@ -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"))
}
4 changes: 2 additions & 2 deletions generated/graphics/wgpu/spirv-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
@@ -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"))
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2025-11-13"
channel = "nightly-2026-04-11"
components = ["rust-src", "rustc-dev", "llvm-tools"]
7 changes: 4 additions & 3 deletions graphics/Cargo.toml.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -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-install = { 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 }
Expand Down
2 changes: 1 addition & 1 deletion graphics/mygraphics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ bytemuck.workspace = true

[build-dependencies]
# rust-gpu
cargo-gpu.workspace = true
cargo-gpu-install.workspace = true

# other
anyhow.workspace = true
2 changes: 1 addition & 1 deletion graphics/mygraphics/Cargo.toml.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions graphics/mygraphics/build.rs
Original file line number Diff line number Diff line change
@@ -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<()> {
Expand All @@ -9,7 +9,9 @@ pub fn main() -> anyhow::Result<()> {
.copied()
.collect::<PathBuf>();

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;
Expand Down
8 changes: 5 additions & 3 deletions graphics/mygraphics/build.rs.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions graphics/mygraphics/src/util.rs
Original file line number Diff line number Diff line change
@@ -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"))
}
2 changes: 1 addition & 1 deletion graphics/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2025-11-13"
channel = "nightly-2026-04-11"
components = ["rust-src", "rustc-dev", "llvm-tools"]
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2025-11-13"
channel = "nightly-2026-04-11"
components = ["rust-src", "rustc-dev", "llvm-tools"]
Loading