From 4e528d1ad2fd15b99f9939f04fa88222f2530ccf Mon Sep 17 00:00:00 2001 From: Joshua Yanovski Date: Wed, 29 Mar 2023 02:38:51 -0700 Subject: [PATCH] Revert "Trying to reduce locking during allocation again..." This reverts commit 39225cdbd56fe28851a75658b84ca6819e58cc7f. --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 806e501cbe..11d4114f2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7928,7 +7928,7 @@ dependencies = [ [[package]] name = "wgpu" version = "0.8.0" -source = "git+https://github.com/pythonesque/wgpu.git?rev=c78c3fe3f05e20d897740607a462dc540e3816a8#c78c3fe3f05e20d897740607a462dc540e3816a8" +source = "git+https://github.com/pythonesque/wgpu.git?rev=6f547242ea4bd649d874b6d19240f80ad0a752ad#6f547242ea4bd649d874b6d19240f80ad0a752ad" dependencies = [ "arrayvec 0.5.2", "js-sys", @@ -7948,7 +7948,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "0.8.0" -source = "git+https://github.com/pythonesque/wgpu.git?rev=c78c3fe3f05e20d897740607a462dc540e3816a8#c78c3fe3f05e20d897740607a462dc540e3816a8" +source = "git+https://github.com/pythonesque/wgpu.git?rev=6f547242ea4bd649d874b6d19240f80ad0a752ad#6f547242ea4bd649d874b6d19240f80ad0a752ad" dependencies = [ "arrayvec 0.5.2", "bitflags", @@ -7989,7 +7989,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "0.8.0" -source = "git+https://github.com/pythonesque/wgpu.git?rev=c78c3fe3f05e20d897740607a462dc540e3816a8#c78c3fe3f05e20d897740607a462dc540e3816a8" +source = "git+https://github.com/pythonesque/wgpu.git?rev=6f547242ea4bd649d874b6d19240f80ad0a752ad#6f547242ea4bd649d874b6d19240f80ad0a752ad" dependencies = [ "bitflags", "serde", diff --git a/Cargo.toml b/Cargo.toml index 614d9fc6a9..a51c237d8d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -119,7 +119,7 @@ key = "veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc=" 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 = "c78c3fe3f05e20d897740607a462dc540e3816a8" } +wgpu = { git = "https://github.com/pythonesque/wgpu.git", rev = "6f547242ea4bd649d874b6d19240f80ad0a752ad" } # wgpu = { path = "../wgpu/wgpu" } # wgpu-core = { path = "../wgpu/wgpu-core" } # wgpu-types = { path = "../wgpu/wgpu-types" }