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

Attempt to avoid calling the driver's allocator within critical sections

Browse Source 
(unless it's going to be immediately memory mapped).
This commit is contained in:
Joshua Yanovski 2022-08-28 17:34:02 -07:00
parent 9453a1e463
commit 6cbf6a7237
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Cargo.lock generated
View File

@ -4021,9 +4021,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.10.0" version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
[[package]] [[package]]
name = "oorandom" name = "oorandom"
@ -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=7421775a022e85a01f17f52fcb2e4a31a44863b3#7421775a022e85a01f17f52fcb2e4a31a44863b3" source = "git+https://github.com/pythonesque/wgpu.git?rev=50a14ff9d164182fe7a036664e6f2ce9671643ac#50a14ff9d164182fe7a036664e6f2ce9671643ac"
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=7421775a022e85a01f17f52fcb2e4a31a44863b3#7421775a022e85a01f17f52fcb2e4a31a44863b3" source = "git+https://github.com/pythonesque/wgpu.git?rev=50a14ff9d164182fe7a036664e6f2ce9671643ac#50a14ff9d164182fe7a036664e6f2ce9671643ac"
dependencies = [ dependencies = [
"arrayvec 0.5.2", "arrayvec 0.5.2",
"bitflags", "bitflags",
@ -7672,6 +7672,7 @@ dependencies = [
"gpu-descriptor", "gpu-descriptor",
"log", "log",
"naga", "naga",
"once_cell",
"parking_lot 0.11.2", "parking_lot 0.11.2",
"profiling", "profiling",
"raw-window-handle 0.3.4", "raw-window-handle 0.3.4",
@ -7694,7 +7695,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=7421775a022e85a01f17f52fcb2e4a31a44863b3#7421775a022e85a01f17f52fcb2e4a31a44863b3" source = "git+https://github.com/pythonesque/wgpu.git?rev=50a14ff9d164182fe7a036664e6f2ce9671643ac#50a14ff9d164182fe7a036664e6f2ce9671643ac"
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 = "7421775a022e85a01f17f52fcb2e4a31a44863b3" } wgpu = { git = "https://github.com/pythonesque/wgpu.git", rev = "50a14ff9d164182fe7a036664e6f2ce9671643ac" }
# 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" }

2
voxygen/anim/src/lib.rs
View File

@ -1,4 +1,4 @@
#![feature(generic_associated_types, bool_to_option)] #![feature(generic_associated_types)]
#![allow(incomplete_features)] #![allow(incomplete_features)]
#![allow(clippy::single_match)] #![allow(clippy::single_match)]
#[cfg(all(feature = "be-dyn-lib", feature = "use-dyn-lib"))] #[cfg(all(feature = "be-dyn-lib", feature = "use-dyn-lib"))]