From 76238059f0ed27f3459b11fba836c37d10783253 Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Tue, 3 Sep 2024 16:00:13 -0700 Subject: [PATCH] [next/wgpu] Patch `wgpu` to git version. --- Cargo.lock | 31 +++++++++++++------------------ Cargo.toml | 2 +- all-is-cubes-base/Cargo.toml | 4 +++- all-is-cubes-wasm/Cargo.lock | 15 +++++---------- all-is-cubes-wasm/Cargo.toml | 2 +- 5 files changed, 23 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a8102967..6185bd824 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1311,7 +1311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -1908,7 +1908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2259,7 +2259,7 @@ dependencies = [ "vec_map", "wasm-bindgen", "web-sys", - "windows 0.58.0", + "windows 0.52.0", ] [[package]] @@ -2394,7 +2394,7 @@ dependencies = [ "log", "presser", "thiserror 1.0.69", - "windows 0.58.0", + "windows 0.54.0", ] [[package]] @@ -3151,7 +3151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3432,8 +3432,7 @@ checksum = "bc0287524726960e07b119cebd01678f852f147742ae0d925e6a520dca956126" [[package]] name = "naga" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "arrayvec", "bit-set", @@ -5146,7 +5145,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -5601,7 +5600,7 @@ dependencies = [ "getrandom", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6309,8 +6308,7 @@ dependencies = [ [[package]] name = "wgpu" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e41253fc7b660735e2a2d9a58c563f2a047d3cc3445293d8f4095538c9e8afbe" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "arrayvec", "bitflags 2.8.0", @@ -6334,8 +6332,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a39b8842dc9ffcbe34346e3ab6d496b32a47f6497e119d762c97fcaae3cb37" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "arrayvec", "bit-vec", @@ -6359,8 +6356,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a782e5056b060b0b4010881d1decddd059e44f2ecd01e2db2971b48ad3627e5" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "android_system_properties", "arrayvec", @@ -6405,8 +6401,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "bitflags 2.8.0", "js-sys", @@ -6436,7 +6431,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fe8f76d64..15ee303ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -294,5 +294,5 @@ overflow-checks = true [patch.crates-io] # Here are some patches we might want to apply for development: # -# wgpu = { git = "https://github.com/gfx-rs/wgpu/", branch = "trunk" } # exhaust = { git = "https://github.com/kpreid/exhaust/", branch = "main" } +wgpu = { git = "https://github.com/gfx-rs/wgpu/", branch = "trunk" } diff --git a/all-is-cubes-base/Cargo.toml b/all-is-cubes-base/Cargo.toml index a77fd7b8c..ce06e599c 100644 --- a/all-is-cubes-base/Cargo.toml +++ b/all-is-cubes-base/Cargo.toml @@ -22,7 +22,9 @@ arbitrary = [ "euclid/arbitrary", "ordered-float/arbitrary" ] -rerun = ["dep:re_types"] +rerun = [ + "dep:re_types" +] serde = [ "dep:serde", "ordered-float/serde", diff --git a/all-is-cubes-wasm/Cargo.lock b/all-is-cubes-wasm/Cargo.lock index c40e501b4..c2d200249 100644 --- a/all-is-cubes-wasm/Cargo.lock +++ b/all-is-cubes-wasm/Cargo.lock @@ -1129,8 +1129,7 @@ checksum = "bc0287524726960e07b119cebd01678f852f147742ae0d925e6a520dca956126" [[package]] name = "naga" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "arrayvec", "bit-set", @@ -1852,8 +1851,7 @@ dependencies = [ [[package]] name = "wgpu" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e41253fc7b660735e2a2d9a58c563f2a047d3cc3445293d8f4095538c9e8afbe" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "arrayvec", "bitflags 2.8.0", @@ -1878,8 +1876,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a39b8842dc9ffcbe34346e3ab6d496b32a47f6497e119d762c97fcaae3cb37" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "arrayvec", "bit-vec", @@ -1903,8 +1900,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a782e5056b060b0b4010881d1decddd059e44f2ecd01e2db2971b48ad3627e5" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "android_system_properties", "arrayvec", @@ -1944,8 +1940,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c" +source = "git+https://github.com/gfx-rs/wgpu/?branch=trunk#779261e64daa6cf76c826532b7a1561d8ec203fd" dependencies = [ "bitflags 2.8.0", "js-sys", diff --git a/all-is-cubes-wasm/Cargo.toml b/all-is-cubes-wasm/Cargo.toml index 3f5505ecc..b117dab8c 100644 --- a/all-is-cubes-wasm/Cargo.toml +++ b/all-is-cubes-wasm/Cargo.toml @@ -214,5 +214,5 @@ overflow-checks = true [patch.crates-io] # Here are some patches we might want to apply for development: # -# wgpu = { git = "https://github.com/gfx-rs/wgpu/", branch = "trunk" } # exhaust = { git = "https://github.com/kpreid/exhaust/", branch = "main" } +wgpu = { git = "https://github.com/gfx-rs/wgpu/", branch = "trunk" }