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
839 changes: 506 additions & 333 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ wgpu = { version = "27.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 = "bb74342b90066ce8b7d50ba8e058df356a54acf4" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }

# other
glam = { version = "0.30.9", default-features = false }
glam = { version = "0.32.0", default-features = false }
bytemuck = { version = "1.24.0", features = ["derive"] }
raw-window-handle = "0.6.2"
winit = "0.30.0"
Expand Down
6 changes: 3 additions & 3 deletions generated/graphics/ash/cargo-gpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ 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 = "bb74342b90066ce8b7d50ba8e058df356a54acf4" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }

# other
glam = { version = "0.30.9", default-features = false }
glam = { version = "0.32.0", default-features = false }
bytemuck = { version = "1.24.0", features = ["derive"] }
raw-window-handle = "0.6.2"
winit = "0.30.0"
Expand Down
6 changes: 3 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;
use cargo_gpu::spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvMetadata};
use cargo_gpu::install::Install;
use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata};
use std::path::PathBuf;

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

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

Expand Down
6 changes: 3 additions & 3 deletions generated/graphics/ash/spirv-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ 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 = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }

# other
glam = { version = "0.30.9", default-features = false }
glam = { version = "0.32.0", default-features = false }
bytemuck = { version = "1.24.0", features = ["derive"] }
raw-window-handle = "0.6.2"
winit = "0.30.0"
Expand Down
4 changes: 2 additions & 2 deletions generated/graphics/ash/spirv-builder/mygraphics/build.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
use spirv_builder::{ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
use std::path::PathBuf;

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

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

Expand Down
6 changes: 3 additions & 3 deletions generated/graphics/wgpu/cargo-gpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ wgpu = { version = "27.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 = "bb74342b90066ce8b7d50ba8e058df356a54acf4" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }

# other
glam = { version = "0.30.9", default-features = false }
glam = { version = "0.32.0", default-features = false }
bytemuck = { version = "1.24.0", features = ["derive"] }
raw-window-handle = "0.6.2"
winit = "0.30.0"
Expand Down
6 changes: 3 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;
use cargo_gpu::spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvMetadata};
use cargo_gpu::install::Install;
use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata};
use std::path::PathBuf;

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

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

Expand Down
6 changes: 3 additions & 3 deletions generated/graphics/wgpu/spirv-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ 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 = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }

# other
glam = { version = "0.30.9", default-features = false }
glam = { version = "0.32.0", default-features = false }
bytemuck = { version = "1.24.0", features = ["derive"] }
raw-window-handle = "0.6.2"
winit = "0.30.0"
Expand Down
4 changes: 2 additions & 2 deletions generated/graphics/wgpu/spirv-builder/mygraphics/build.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
use spirv_builder::{ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
use std::path::PathBuf;

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

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

Expand Down
8 changes: 4 additions & 4 deletions graphics/Cargo.toml.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ 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 = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }
{% endif -%}
{% if integration == "cargo-gpu" -%}
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "bb74342b90066ce8b7d50ba8e058df356a54acf4" }
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" }
{% endif -%}
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "96fcc9dbe475921997050c25c02a62c7a12d48e0" }
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" }

# other
glam = { version = "0.30.9", default-features = false }
glam = { version = "0.32.0", default-features = false }
bytemuck = { version = "1.24.0", features = ["derive"] }
raw-window-handle = "0.6.2"
winit = "0.30.0"
Expand Down
6 changes: 3 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;
use cargo_gpu::spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvMetadata};
use cargo_gpu::install::Install;
use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata};
use std::path::PathBuf;

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

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

Expand Down
8 changes: 4 additions & 4 deletions graphics/mygraphics/build.rs.liquid
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% if integration == "spirv-builder" -%}
use spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
use spirv_builder::{ShaderPanicStrategy, SpirvBuilder, SpirvMetadata};
{% endif -%}
{% if integration == "cargo-gpu" -%}
use cargo_gpu::Install;
use cargo_gpu::spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvMetadata};
use cargo_gpu::install::Install;
use cargo_gpu::spirv_builder::{ShaderPanicStrategy, SpirvMetadata};
{% endif -%}
use std::path::PathBuf;

Expand All @@ -21,7 +21,7 @@ pub fn main() -> anyhow::Result<()> {
let install = Install::from_shader_crate(crate_path.clone()).run()?;
let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3");
{% endif -%}
builder.print_metadata = MetadataPrintout::DependencyOnly;
builder.build_script.defaults = true;
builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit;
builder.spirv_metadata = SpirvMetadata::Full;

Expand Down
Loading