diff --git a/Cargo.lock b/Cargo.lock index bad06a1b1d..c58ebccd8f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -569,7 +569,8 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "d3d12" version = "0.6.0" -source = "git+https://github.com/gfx-rs/d3d12-rs?rev=b940b1d71#b940b1d71ab7083ae80eec697872672dc1f2bd32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ "bitflags", "libloading", @@ -1015,9 +1016,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hassle-rs" -version = "0.10.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" dependencies = [ "bitflags", "com-rs", @@ -1427,8 +1428,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.11.0" -source = "git+https://github.com/gfx-rs/naga?rev=9742f1616c3e3dd2cc9a5880616fc886c391bb9f#9742f1616c3e3dd2cc9a5880616fc886c391bb9f" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271" dependencies = [ "bit-set", "bitflags", @@ -1950,9 +1952,9 @@ checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" [[package]] name = "rspirv" @@ -2729,8 +2731,9 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.15.0" -source = "git+https://github.com/gfx-rs/wgpu#a50228230797e4b6005e2e6ed83638646aa5e055" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" dependencies = [ "arrayvec", "cfg-if", @@ -2752,19 +2755,20 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.15.0" -source = "git+https://github.com/gfx-rs/wgpu#a50228230797e4b6005e2e6ed83638646aa5e055" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" dependencies = [ "arrayvec", "bit-vec", "bitflags", "codespan-reporting", + "fxhash", "log", "naga", "parking_lot", "profiling", "raw-window-handle 0.5.1", - "rustc-hash", "smallvec", "thiserror", "web-sys", @@ -2774,8 +2778,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.15.1" -source = "git+https://github.com/gfx-rs/wgpu#a50228230797e4b6005e2e6ed83638646aa5e055" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" dependencies = [ "android_system_properties", "arrayvec", @@ -2786,6 +2791,7 @@ dependencies = [ "core-graphics-types", "d3d12", "foreign-types", + "fxhash", "glow", "gpu-alloc", "gpu-allocator", @@ -2804,7 +2810,6 @@ dependencies = [ "range-alloc", "raw-window-handle 0.5.1", "renderdoc-sys", - "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", @@ -2815,8 +2820,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.15.0" -source = "git+https://github.com/gfx-rs/wgpu#a50228230797e4b6005e2e6ed83638646aa5e055" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" dependencies = [ "bitflags", "js-sys", @@ -2825,9 +2831,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" [[package]] name = "winapi" diff --git a/examples/runners/wgpu/Cargo.toml b/examples/runners/wgpu/Cargo.toml index 4d0ceb11d0..15a414e3e6 100644 --- a/examples/runners/wgpu/Cargo.toml +++ b/examples/runners/wgpu/Cargo.toml @@ -21,7 +21,7 @@ cfg-if = "1.0.0" shared = { path = "../../shaders/shared" } futures = { version = "0.3", default-features = false, features = ["std", "executor"] } # Vulkan SDK or MoltenVK needs to be installed for `vulkan-portability` to work on macOS -wgpu = { git = "https://github.com/gfx-rs/wgpu", features = ["spirv", "vulkan-portability"] } +wgpu = { version = "0.15.0", features = ["spirv", "vulkan-portability"] } winit = { version = "0.28.3", features = ["android-native-activity"] } structopt = "0.3" strum = { version = "0.23.0", default_features = false, features = ["std", "derive"] }