diff --git a/Cargo.lock b/Cargo.lock index 095398cc15..80e19c41ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4021,9 +4021,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" [[package]] name = "oorandom" @@ -7634,7 +7634,7 @@ dependencies = [ [[package]] name = "wgpu" 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 = [ "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=7421775a022e85a01f17f52fcb2e4a31a44863b3#7421775a022e85a01f17f52fcb2e4a31a44863b3" +source = "git+https://github.com/pythonesque/wgpu.git?rev=50a14ff9d164182fe7a036664e6f2ce9671643ac#50a14ff9d164182fe7a036664e6f2ce9671643ac" dependencies = [ "arrayvec 0.5.2", "bitflags", @@ -7672,6 +7672,7 @@ dependencies = [ "gpu-descriptor", "log", "naga", + "once_cell", "parking_lot 0.11.2", "profiling", "raw-window-handle 0.3.4", @@ -7694,7 +7695,7 @@ dependencies = [ [[package]] name = "wgpu-types" 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 = [ "bitflags", "serde", diff --git a/Cargo.toml b/Cargo.toml index 488abeac1e..f987a31a7b 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 = "7421775a022e85a01f17f52fcb2e4a31a44863b3" } +wgpu = { git = "https://github.com/pythonesque/wgpu.git", rev = "50a14ff9d164182fe7a036664e6f2ce9671643ac" } # wgpu = { path = "../wgpu/wgpu" } # wgpu-core = { path = "../wgpu/wgpu-core" } # wgpu-types = { path = "../wgpu/wgpu-types" } diff --git a/voxygen/anim/src/lib.rs b/voxygen/anim/src/lib.rs index e3aa8d44f9..9a3457c825 100644 --- a/voxygen/anim/src/lib.rs +++ b/voxygen/anim/src/lib.rs @@ -1,4 +1,4 @@ -#![feature(generic_associated_types, bool_to_option)] +#![feature(generic_associated_types)] #![allow(incomplete_features)] #![allow(clippy::single_match)] #[cfg(all(feature = "be-dyn-lib", feature = "use-dyn-lib"))]