From 8e21787276ce5570f7bc98045f5a16ec60419840 Mon Sep 17 00:00:00 2001 From: Schell Carl Scivally Date: Sun, 12 Jan 2025 11:19:48 +1300 Subject: [PATCH] patch spirv-std --- Cargo.lock | 58 +++++++++--------------------------------------------- Cargo.toml | 3 +++ 2 files changed, 12 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ff93b5e..46e2d85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -720,8 +720,8 @@ checksum = "6d3486b5979b1c73ca6ba48f69e2abd7941dd72b0e725519d113aef61ff7a236" dependencies = [ "crabslab-derive", "futures-lite 1.13.0", - "glam 0.29.2", - "spirv-std 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glam", + "spirv-std", ] [[package]] @@ -1196,15 +1196,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "glam" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" -dependencies = [ - "libm", -] - [[package]] name = "glam" version = "0.29.2" @@ -1472,7 +1463,7 @@ dependencies = [ name = "img-diff" version = "0.1.0" dependencies = [ - "glam 0.29.2", + "glam", "image", "snafu 0.7.5", ] @@ -2797,7 +2788,7 @@ dependencies = [ "example", "fastrand 2.3.0", "futures-lite 1.13.0", - "glam 0.29.2", + "glam", "gltf", "half", "icosahedron", @@ -2813,7 +2804,7 @@ dependencies = [ "serde", "serde_json", "snafu 0.8.5", - "spirv-std 0.9.0 (git+https://github.com/Rust-GPU/rust-gpu?rev=562dff9176f63b318e9b34620ffacb8aa89dae9a)", + "spirv-std", "ttf-parser 0.20.0", "wgpu", "winit", @@ -3119,41 +3110,16 @@ dependencies = [ "bitflags 2.7.0", ] -[[package]] -name = "spirv-std" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c3c0972a2df79abe2c8af2fe7f7937a9aa558b6a1f78fc5edf93f4d480d757" -dependencies = [ - "bitflags 1.3.2", - "glam 0.24.2", - "num-traits", - "spirv-std-macros 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "spirv-std-types 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "spirv-std" version = "0.9.0" source = "git+https://github.com/Rust-GPU/rust-gpu?rev=562dff9176f63b318e9b34620ffacb8aa89dae9a#562dff9176f63b318e9b34620ffacb8aa89dae9a" dependencies = [ "bitflags 1.3.2", - "glam 0.29.2", + "glam", "num-traits", - "spirv-std-macros 0.9.0 (git+https://github.com/Rust-GPU/rust-gpu?rev=562dff9176f63b318e9b34620ffacb8aa89dae9a)", - "spirv-std-types 0.9.0 (git+https://github.com/Rust-GPU/rust-gpu?rev=562dff9176f63b318e9b34620ffacb8aa89dae9a)", -] - -[[package]] -name = "spirv-std-macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f776bf9f2897ea7acff15d7753711fdf1693592bd7459a01c394262b1df45c" -dependencies = [ - "proc-macro2", - "quote", - "spirv-std-types 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.109", + "spirv-std-macros", + "spirv-std-types", ] [[package]] @@ -3163,16 +3129,10 @@ source = "git+https://github.com/Rust-GPU/rust-gpu?rev=562dff9176f63b318e9b34620 dependencies = [ "proc-macro2", "quote", - "spirv-std-types 0.9.0 (git+https://github.com/Rust-GPU/rust-gpu?rev=562dff9176f63b318e9b34620ffacb8aa89dae9a)", + "spirv-std-types", "syn 2.0.96", ] -[[package]] -name = "spirv-std-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a73417b7d72d95b4995c840dceb4e3b4bcbad4ff7f35df9c1655b6826c18d3a9" - [[package]] name = "spirv-std-types" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index 772b322..027a107 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,3 +58,6 @@ opt-level = 3 [profile.dev.package.gltf] opt-level = 3 + +[patch.crates-io] +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "562dff9176f63b318e9b34620ffacb8aa89dae9a" }