diff --git a/Cargo.lock b/Cargo.lock index 21656d9..abc1030 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -634,7 +634,7 @@ dependencies = [ [[package]] name = "naga" version = "0.8.0" -source = "git+https://github.com/gfx-rs/naga?rev=1aa91549#1aa9154964238af8c692cf521ff90e1f2395e147" +source = "git+https://github.com/gfx-rs/naga?rev=85056524#850565243d1d0d03215f13246c94d63e1d4c51cd" dependencies = [ "bit-set", "bitflags", @@ -798,17 +798,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.3", + "parking_lot_core", ] [[package]] @@ -825,19 +815,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "parking_lot_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - [[package]] name = "percent-encoding" version = "2.1.0" @@ -1237,13 +1214,12 @@ dependencies = [ [[package]] name = "wgpu" version = "0.12.0" -source = "git+https://github.com/gfx-rs/wgpu/#ee3d23d5467898d276b73491ac077e5241589b75" dependencies = [ "arrayvec", "js-sys", "log", "naga", - "parking_lot 0.12.0", + "parking_lot", "raw-window-handle", "smallvec", "wasm-bindgen", @@ -1257,7 +1233,6 @@ dependencies = [ [[package]] name = "wgpu-core" version = "0.12.0" -source = "git+https://github.com/gfx-rs/wgpu/#ee3d23d5467898d276b73491ac077e5241589b75" dependencies = [ "arrayvec", "bitflags", @@ -1267,7 +1242,7 @@ dependencies = [ "fxhash", "log", "naga", - "parking_lot 0.12.0", + "parking_lot", "profiling", "raw-window-handle", "smallvec", @@ -1279,7 +1254,6 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "0.12.0" -source = "git+https://github.com/gfx-rs/wgpu/#ee3d23d5467898d276b73491ac077e5241589b75" dependencies = [ "arrayvec", "ash", @@ -1301,7 +1275,7 @@ dependencies = [ "metal", "naga", "objc", - "parking_lot 0.12.0", + "parking_lot", "profiling", "range-alloc", "raw-window-handle", @@ -1316,7 +1290,6 @@ dependencies = [ [[package]] name = "wgpu-types" version = "0.12.0" -source = "git+https://github.com/gfx-rs/wgpu/#ee3d23d5467898d276b73491ac077e5241589b75" dependencies = [ "bitflags", ] @@ -1352,49 +1325,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "winit" version = "0.26.1" @@ -1416,7 +1346,7 @@ dependencies = [ "ndk-glue", "ndk-sys", "objc", - "parking_lot 0.11.2", + "parking_lot", "percent-encoding", "raw-window-handle", "smithay-client-toolkit", diff --git a/Cargo.toml b/Cargo.toml index 2fa6165..5b5f2e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,4 +17,4 @@ pollster = "0.2.5" winit = "0.26.1" [patch.crates-io] -wgpu = { path = "../../wgpu/wgpu" } +wgpu = { path = "../wgpu/wgpu" }