Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

In wgpu, take slightly more conservative locks.

Browse Source 
I don't think this should actually affect anything in Veloren but it's
probably required for correctness in general.
This commit is contained in:
Joshua Yanovski 2022-08-26 17:16:28 -07:00
parent 13bbc06f9b
commit 9453a1e463
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -7634,7 +7634,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu" name = "wgpu"
version = "0.8.0" 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 = [ dependencies = [
"arrayvec 0.5.2", "arrayvec 0.5.2",
"js-sys", "js-sys",
@ -7654,7 +7654,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-core" name = "wgpu-core"
version = "0.8.0" 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 = [ dependencies = [
"arrayvec 0.5.2", "arrayvec 0.5.2",
"bitflags", "bitflags",
@ -7694,7 +7694,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-types" name = "wgpu-types"
version = "0.8.0" 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 = [ dependencies = [
"bitflags", "bitflags",
"serde", "serde",

2
Cargo.toml
View File

@ -123,7 +123,7 @@ nativeBuildInputs = ["pkg-config"]
vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986c5477341bea4456be26" } vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986c5477341bea4456be26" }
# patch wgpu so we can use wgpu-profiler crate # 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/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 = { path = "../wgpu/wgpu" }
# wgpu-core = { path = "../wgpu/wgpu-core" } # wgpu-core = { path = "../wgpu/wgpu-core" }
# wgpu-types = { path = "../wgpu/wgpu-types" } # wgpu-types = { path = "../wgpu/wgpu-types" }