From a2600f35d7233ef69308f7df1d1f0fa92bb0fca4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 00:22:26 +0000 Subject: [PATCH] Bump wgpu from 0.19.4 to 0.20.1 Bumps [wgpu](https://github.com/gfx-rs/wgpu) from 0.19.4 to 0.20.1. - [Release notes](https://github.com/gfx-rs/wgpu/releases) - [Changelog](https://github.com/gfx-rs/wgpu/blob/v0.20.1/CHANGELOG.md) - [Commits](https://github.com/gfx-rs/wgpu/compare/v0.19.4...v0.20.1) --- updated-dependencies: - dependency-name: wgpu dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 225 ++++++++++++++++++++++++++++--- crates/gosub_renderer/Cargo.toml | 2 +- crates/gosub_vello/Cargo.toml | 2 +- 3 files changed, 210 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b48837ad..1c634a389 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -987,6 +987,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "d3d12" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" +dependencies = [ + "bitflags 2.5.0", + "libloading 0.8.3", + "winapi", +] + [[package]] name = "data-encoding" version = "2.5.0" @@ -1041,6 +1052,15 @@ dependencies = [ "libloading 0.8.3", ] +[[package]] +name = "document-features" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +dependencies = [ + "litrs", +] + [[package]] name = "domain-lookup-tree" version = "0.1.1" @@ -1569,7 +1589,7 @@ dependencies = [ "vello", "wasm-bindgen-futures", "web-sys", - "wgpu", + "wgpu 0.20.1", "winit 0.29.15", ] @@ -1682,7 +1702,7 @@ dependencies = [ "raw-window-handle", "smallvec", "vello", - "wgpu", + "wgpu 0.20.1", ] [[package]] @@ -1752,7 +1772,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.5.0", - "gpu-descriptor-types", + "gpu-descriptor-types 0.1.2", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.5.0", + "gpu-descriptor-types 0.2.0", "hashbrown", ] @@ -1765,6 +1796,15 @@ dependencies = [ "bitflags 2.5.0", ] +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "grid" version = "0.14.0" @@ -2266,6 +2306,12 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.11" @@ -2355,6 +2401,21 @@ dependencies = [ "paste", ] +[[package]] +name = "metal" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2412,6 +2473,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "naga" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.5.0", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + [[package]] name = "ndk" version = "0.8.0" @@ -2906,7 +2988,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.65", ] [[package]] @@ -4227,7 +4309,7 @@ dependencies = [ "raw-window-handle", "skrifa", "vello_encoding", - "wgpu", + "wgpu 0.19.4", ] [[package]] @@ -4526,7 +4608,7 @@ dependencies = [ "cfg_aliases 0.1.1", "js-sys", "log", - "naga", + "naga 0.19.2", "parking_lot", "profiling", "raw-window-handle", @@ -4535,9 +4617,35 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.19.3", + "wgpu-hal 0.19.3", + "wgpu-types 0.19.2", +] + +[[package]] +name = "wgpu" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases 0.1.1", + "document-features", + "js-sys", + "log", + "naga 0.20.0", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.21.0", + "wgpu-hal 0.21.0", + "wgpu-types 0.20.0", ] [[package]] @@ -4553,7 +4661,34 @@ dependencies = [ "codespan-reporting", "indexmap", "log", - "naga", + "naga 0.19.2", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal 0.19.3", + "wgpu-types 0.19.2", +] + +[[package]] +name = "wgpu-core" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59e0d5fc509601c69e4e1fa06c1eb3c4c9f12956a5e30c79b61ef1c1be7daf0" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.5.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "document-features", + "indexmap", + "log", + "naga 0.20.0", "once_cell", "parking_lot", "profiling", @@ -4562,8 +4697,8 @@ dependencies = [ "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.21.0", + "wgpu-types 0.20.0", ] [[package]] @@ -4580,20 +4715,65 @@ dependencies = [ "block", "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12", + "d3d12 0.19.0", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor 0.2.4", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.3", + "log", + "metal 0.27.0", + "naga 0.19.2", + "ndk-sys 0.5.0+25.2.9519653", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.19.2", + "winapi", +] + +[[package]] +name = "wgpu-hal" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa24c3889f885a3fb9133b454c8418bfcfaadcfe4ed3be96ac80e76703b863b" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.5.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "d3d12 0.20.0", "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", - "gpu-descriptor", + "gpu-descriptor 0.3.0", "hassle-rs", "js-sys", "khronos-egl", "libc", "libloading 0.8.3", "log", - "metal", - "naga", + "metal 0.28.0", + "naga 0.20.0", "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", @@ -4607,7 +4787,7 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.20.0", "winapi", ] @@ -4622,6 +4802,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wgpu-types" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" +dependencies = [ + "bitflags 2.5.0", + "js-sys", + "web-sys", +] + [[package]] name = "which" version = "5.0.0" diff --git a/crates/gosub_renderer/Cargo.toml b/crates/gosub_renderer/Cargo.toml index 6eb99435a..c3701db00 100644 --- a/crates/gosub_renderer/Cargo.toml +++ b/crates/gosub_renderer/Cargo.toml @@ -18,7 +18,7 @@ taffy = "0.5.1" vello = "0.1.0" winit = "0.29.15" anyhow = "1.0.86" -wgpu = "0.19.3" +wgpu = "0.20.1" futures = "0.3.30" slotmap = "1.0.7" smallvec = "1.13.2" diff --git a/crates/gosub_vello/Cargo.toml b/crates/gosub_vello/Cargo.toml index 532c3aa65..40c06f009 100644 --- a/crates/gosub_vello/Cargo.toml +++ b/crates/gosub_vello/Cargo.toml @@ -11,6 +11,6 @@ vello = "0.1.0" image = "0.25.1" smallvec = "1.13.2" anyhow = "1.0.82" -wgpu = "0.19.4" +wgpu = "0.20.1" raw-window-handle = "0.6.2" futures = "0.3.30" \ No newline at end of file