From 9453a1e463b2f5bfcf52e88058eb3e263f5bc325 Mon Sep 17 00:00:00 2001
From: Joshua Yanovski <pythonesque@gmail.com>
Date: Fri, 26 Aug 2022 17:16:28 -0700
Subject: [PATCH] In wgpu, take slightly more conservative locks.

I don't think this should actually affect anything in Veloren but it's
probably required for correctness in general.
---
 Cargo.lock | 6 +++---
 Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f59ebf49a..095398cc15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7634,7 +7634,7 @@ dependencies = [
 [[package]]
 name = "wgpu"
 version = "0.8.0"
-source = "git+https://github.com/pythonesque/wgpu.git?rev=4d7766fc4c7d01f8ef98b1503f27fdc3600d1e13#4d7766fc4c7d01f8ef98b1503f27fdc3600d1e13"
+source = "git+https://github.com/pythonesque/wgpu.git?rev=7421775a022e85a01f17f52fcb2e4a31a44863b3#7421775a022e85a01f17f52fcb2e4a31a44863b3"
 dependencies = [
  "arrayvec 0.5.2",
  "js-sys",
@@ -7654,7 +7654,7 @@ dependencies = [
 [[package]]
 name = "wgpu-core"
 version = "0.8.0"
-source = "git+https://github.com/pythonesque/wgpu.git?rev=4d7766fc4c7d01f8ef98b1503f27fdc3600d1e13#4d7766fc4c7d01f8ef98b1503f27fdc3600d1e13"
+source = "git+https://github.com/pythonesque/wgpu.git?rev=7421775a022e85a01f17f52fcb2e4a31a44863b3#7421775a022e85a01f17f52fcb2e4a31a44863b3"
 dependencies = [
  "arrayvec 0.5.2",
  "bitflags",
@@ -7694,7 +7694,7 @@ dependencies = [
 [[package]]
 name = "wgpu-types"
 version = "0.8.0"
-source = "git+https://github.com/pythonesque/wgpu.git?rev=4d7766fc4c7d01f8ef98b1503f27fdc3600d1e13#4d7766fc4c7d01f8ef98b1503f27fdc3600d1e13"
+source = "git+https://github.com/pythonesque/wgpu.git?rev=7421775a022e85a01f17f52fcb2e4a31a44863b3#7421775a022e85a01f17f52fcb2e4a31a44863b3"
 dependencies = [
  "bitflags",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index f3382c2e28..488abeac1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -123,7 +123,7 @@ nativeBuildInputs = ["pkg-config"]
 vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986c5477341bea4456be26" }
 # patch wgpu so we can use wgpu-profiler crate
 # wgpu = { git = "https://github.com/gfx-rs/wgpu.git", rev = "a92b8549a8e2cb9dac781bafc5ed32828f3caf46" }
-wgpu = { git = "https://github.com/pythonesque/wgpu.git", rev = "4d7766fc4c7d01f8ef98b1503f27fdc3600d1e13" }
+wgpu = { git = "https://github.com/pythonesque/wgpu.git", rev = "7421775a022e85a01f17f52fcb2e4a31a44863b3" }
 # wgpu = { path = "../wgpu/wgpu" }
 # wgpu-core = { path = "../wgpu/wgpu-core" }
 # wgpu-types = { path = "../wgpu/wgpu-types" }