switch back to wgpu releaseHEADmaster

2 files changed, 17 insertions, 141 deletions

diff --git a/Cargo.lock b/Cargo.lock
index fd7c19e..c0aff50 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1028,7 +1028,7 @@ dependencies = [
  "thiserror 1.0.69",
  "type-map",
  "web-time",
- "wgpu 24.0.1",
+ "wgpu",
 ]
 
 [[package]]
@@ -1857,27 +1857,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "naga"
-version = "24.0.0"
-source = "git+https://github.com/metamuffin/wgpu?rev=a9189e0#a9189e0001c3e8c18af92aa2ec9c2405264ac017"
-dependencies = [
- "arrayvec",
- "bit-set",
- "bitflags 2.9.0",
- "cfg_aliases",
- "codespan-reporting",
- "hexf-parse",
- "indexmap 2.8.0",
- "log",
- "rustc-hash",
- "spirv",
- "strum",
- "termcolor",
- "thiserror 2.0.12",
- "unicode-xid",
-]
-
-[[package]]
 name = "ndk"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3617,7 +3596,7 @@ dependencies = [
  "rand 0.9.0",
  "rayon",
  "weareshared",
- "wgpu 24.0.0",
+ "wgpu",
  "winit",
  "xdg",
 ]
@@ -3695,34 +3674,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu"
-version = "24.0.0"
-source = "git+https://github.com/metamuffin/wgpu?rev=a9189e0#a9189e0001c3e8c18af92aa2ec9c2405264ac017"
-dependencies = [
- "arrayvec",
- "bitflags 2.9.0",
- "cfg_aliases",
- "document-features",
- "js-sys",
- "log",
- "naga 24.0.0 (git+https://github.com/metamuffin/wgpu?rev=a9189e0)",
- "parking_lot",
- "profiling",
- "raw-window-handle",
- "smallvec",
- "static_assertions",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core 24.0.0",
- "wgpu-hal 24.0.0",
- "wgpu-types 24.0.0 (git+https://github.com/metamuffin/wgpu?rev=a9189e0)",
-]
-
-[[package]]
-name = "wgpu"
-version = "24.0.1"
+version = "24.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47f55718f85c2fa756edffa0e7f0e0a60aba463d1362b57e23123c58f035e4b6"
+checksum = "35904fb00ba2d2e0a4d002fcbbb6e1b89b574d272a50e5fc95f6e81cf281c245"
 dependencies = [
  "arrayvec",
  "bitflags 2.9.0",
@@ -3730,6 +3684,7 @@ dependencies = [
  "document-features",
  "js-sys",
  "log",
+ "naga",
  "parking_lot",
  "profiling",
  "raw-window-handle",
@@ -3738,34 +3693,9 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "wgpu-core 24.0.2",
- "wgpu-hal 24.0.2",
- "wgpu-types 24.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "24.0.0"
-source = "git+https://github.com/metamuffin/wgpu?rev=a9189e0#a9189e0001c3e8c18af92aa2ec9c2405264ac017"
-dependencies = [
- "arrayvec",
- "bit-vec",
- "bitflags 2.9.0",
- "cfg_aliases",
- "document-features",
- "hashbrown 0.15.2",
- "indexmap 2.8.0",
- "log",
- "naga 24.0.0 (git+https://github.com/metamuffin/wgpu?rev=a9189e0)",
- "once_cell",
- "parking_lot",
- "profiling",
- "raw-window-handle",
- "rustc-hash",
- "smallvec",
- "thiserror 2.0.12",
- "wgpu-hal 24.0.0",
- "wgpu-types 24.0.0 (git+https://github.com/metamuffin/wgpu?rev=a9189e0)",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -3781,7 +3711,7 @@ dependencies = [
  "document-features",
  "indexmap 2.8.0",
  "log",
- "naga 24.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "naga",
  "once_cell",
  "parking_lot",
  "profiling",
@@ -3789,14 +3719,15 @@ dependencies = [
  "rustc-hash",
  "smallvec",
  "thiserror 2.0.12",
- "wgpu-hal 24.0.2",
- "wgpu-types 24.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "24.0.0"
-source = "git+https://github.com/metamuffin/wgpu?rev=a9189e0#a9189e0001c3e8c18af92aa2ec9c2405264ac017"
+version = "24.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4317a17171dc20e6577bf606796794580accae0716a69edbc7388c86a3ec9f23"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -3812,14 +3743,13 @@ dependencies = [
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
- "hashbrown 0.15.2",
  "js-sys",
  "khronos-egl",
  "libc",
  "libloading",
  "log",
  "metal",
- "naga 24.0.0 (git+https://github.com/metamuffin/wgpu?rev=a9189e0)",
+ "naga",
  "ndk-sys 0.5.0+25.2.9519653",
  "objc",
  "once_cell",
@@ -3834,53 +3764,12 @@ dependencies = [
  "thiserror 2.0.12",
  "wasm-bindgen",
  "web-sys",
- "wgpu-types 24.0.0 (git+https://github.com/metamuffin/wgpu?rev=a9189e0)",
+ "wgpu-types",
  "windows 0.58.0",
  "windows-core 0.58.0",
 ]
 
 [[package]]
-name = "wgpu-hal"
-version = "24.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4317a17171dc20e6577bf606796794580accae0716a69edbc7388c86a3ec9f23"
-dependencies = [
- "android_system_properties",
- "arrayvec",
- "ash",
- "bitflags 2.9.0",
- "bytemuck",
- "cfg_aliases",
- "core-graphics-types",
- "glow",
- "glutin_wgl_sys",
- "gpu-alloc",
- "gpu-descriptor",
- "js-sys",
- "khronos-egl",
- "libc",
- "libloading",
- "log",
- "metal",
- "naga 24.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ndk-sys 0.5.0+25.2.9519653",
- "objc",
- "once_cell",
- "ordered-float",
- "parking_lot",
- "profiling",
- "raw-window-handle",
- "renderdoc-sys",
- "rustc-hash",
- "smallvec",
- "thiserror 2.0.12",
- "wasm-bindgen",
- "web-sys",
- "wgpu-types 24.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "windows 0.58.0",
-]
-
-[[package]]
 name = "wgpu-types"
 version = "24.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3893,18 +3782,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "wgpu-types"
-version = "24.0.0"
-source = "git+https://github.com/metamuffin/wgpu?rev=a9189e0#a9189e0001c3e8c18af92aa2ec9c2405264ac017"
-dependencies = [
- "bitflags 2.9.0",
- "js-sys",
- "log",
- "serde",
- "web-sys",
-]
-
-[[package]]
 name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index ab677e8..a9857fe 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -15,8 +15,7 @@ cpal = "0.15.3"
 env_logger = "0.11.7"
 log = "0.4.26"
 pollster = "0.4.0"
-# wgpu = "23.0.1" # Switch back when deadlock fix is upstream
-wgpu = { git = "https://github.com/metamuffin/wgpu", rev = "a9189e0" }
+wgpu = "24.0.3"
 winit = "0.30.9"
 weareshared = { path = "../shared" }
 rand = "0.9.0"