Skip to content

Commit 72c4d98

Browse files
Firestar99Firestar99
committed
update: rust-gpu and cargo-gpu
1 parent 9d26ac9 commit 72c4d98

File tree

13 files changed

+53
-86
lines changed

13 files changed

+53
-86
lines changed

‎Cargo.lock‎

Lines changed: 23 additions & 56 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
@@ -25,8 +25,8 @@ wgpu = { version = "27.0.1", default-features = false, features = ["std", "parki
2525
pollster = "0.4.0"
2626

2727
# rust-gpu
28-
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "bb74342b90066ce8b7d50ba8e058df356a54acf4" }
29-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
28+
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" }
29+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
3030

3131
# other
3232
glam = { version = "0.32.0", default-features = false }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ 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 = "bb74342b90066ce8b7d50ba8e058df356a54acf4" }
26-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
25+
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" }
26+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
2727

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use cargo_gpu::Install;
2-
use cargo_gpu::spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvMetadata};
1+
use cargo_gpu::install::Install;
2+
use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata};
33
use std::path::PathBuf;
44

55
pub fn main() -> anyhow::Result<()> {
@@ -11,7 +11,7 @@ pub fn main() -> anyhow::Result<()> {
1111

1212
let install = Install::from_shader_crate(crate_path.clone()).run()?;
1313
let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3");
14-
builder.print_metadata = MetadataPrintout::DependencyOnly;
14+
builder.build_script.defaults = true;
1515
builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit;
1616
builder.spirv_metadata = SpirvMetadata::Full;
1717

‎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 = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
27-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
26+
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
27+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
2828

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

‎generated/graphics/ash/spirv-builder/mygraphics/build.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
1+
use spirv_builder::{ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
22
use std::path::PathBuf;
33

44
pub fn main() -> anyhow::Result<()> {
@@ -9,7 +9,7 @@ pub fn main() -> anyhow::Result<()> {
99
.collect::<PathBuf>();
1010

1111
let mut builder = SpirvBuilder::new(crate_path, "spirv-unknown-vulkan1.3");
12-
builder.print_metadata = MetadataPrintout::DependencyOnly;
12+
builder.build_script.defaults = true;
1313
builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit;
1414
builder.spirv_metadata = SpirvMetadata::Full;
1515

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ wgpu = { version = "27.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 = "bb74342b90066ce8b7d50ba8e058df356a54acf4" }
25-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
24+
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" }
25+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
2626

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use cargo_gpu::Install;
2-
use cargo_gpu::spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvMetadata};
1+
use cargo_gpu::install::Install;
2+
use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata};
33
use std::path::PathBuf;
44

55
pub fn main() -> anyhow::Result<()> {
@@ -11,7 +11,7 @@ pub fn main() -> anyhow::Result<()> {
1111

1212
let install = Install::from_shader_crate(crate_path.clone()).run()?;
1313
let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3");
14-
builder.print_metadata = MetadataPrintout::DependencyOnly;
14+
builder.build_script.defaults = true;
1515
builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit;
1616
builder.spirv_metadata = SpirvMetadata::Full;
1717

‎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 = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
26-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
25+
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
26+
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
2727

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

‎generated/graphics/wgpu/spirv-builder/mygraphics/build.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
1+
use spirv_builder::{ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
22
use std::path::PathBuf;
33

44
pub fn main() -> anyhow::Result<()> {
@@ -9,7 +9,7 @@ pub fn main() -> anyhow::Result<()> {
99
.collect::<PathBuf>();
1010

1111
let mut builder = SpirvBuilder::new(crate_path, "spirv-unknown-vulkan1.3");
12-
builder.print_metadata = MetadataPrintout::DependencyOnly;
12+
builder.build_script.defaults = true;
1313
builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit;
1414
builder.spirv_metadata = SpirvMetadata::Full;
1515

0 commit comments

Comments
 (0)