diff --git a/Cargo.lock b/Cargo.lock index a9186e43..824dca8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1038,9 +1038,9 @@ dependencies = [ [[package]] name = "d3d12" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" +checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" dependencies = [ "bitflags 2.5.0", "libloading 0.8.3", @@ -1162,7 +1162,7 @@ dependencies = [ "thiserror", "type-map", "web-time", - "wgpu", + "wgpu 0.19.4", "winit", ] @@ -1660,7 +1660,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", ] @@ -1673,6 +1684,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 = "h2" version = "0.4.5" @@ -2241,6 +2261,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 0.5.0", + "log", + "objc", + "paste", +] + [[package]] name = "mime" version = "0.3.17" @@ -2294,6 +2329,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 = "native-tls" version = "0.2.12" @@ -3714,7 +3770,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webbrowser 1.0.1", - "wgpu", + "wgpu 0.20.1", "winit", ] @@ -4455,7 +4511,6 @@ dependencies = [ "cfg_aliases 0.1.1", "js-sys", "log", - "naga", "parking_lot", "profiling", "raw-window-handle 0.6.2", @@ -4464,9 +4519,35 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.19.4", + "wgpu-hal 0.19.4", + "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 0.6.2", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.21.1", + "wgpu-hal 0.21.1", + "wgpu-types 0.20.0", ] [[package]] @@ -4482,7 +4563,7 @@ dependencies = [ "codespan-reporting", "indexmap", "log", - "naga", + "naga 0.19.2", "once_cell", "parking_lot", "profiling", @@ -4491,8 +4572,35 @@ dependencies = [ "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.19.4", + "wgpu-types 0.19.2", +] + +[[package]] +name = "wgpu-core" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" +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", + "raw-window-handle 0.6.2", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal 0.21.1", + "wgpu-types 0.20.0", ] [[package]] @@ -4500,6 +4608,47 @@ name = "wgpu-hal" version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bitflags 2.5.0", + "cfg_aliases 0.1.1", + "core-graphics-types", + "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", + "objc", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle 0.6.2", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.19.2", + "winapi", +] + +[[package]] +name = "wgpu-hal" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" dependencies = [ "android_system_properties", "arrayvec", @@ -4514,15 +4663,15 @@ dependencies = [ "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", "objc", "once_cell", @@ -4536,7 +4685,7 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.20.0", "winapi", ] @@ -4551,6 +4700,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 = "widestring" version = "1.1.0" diff --git a/tetanes/Cargo.toml b/tetanes/Cargo.toml index 7a842eac..ca67f925 100644 --- a/tetanes/Cargo.toml +++ b/tetanes/Cargo.toml @@ -81,7 +81,7 @@ rfd = "0.14" semver = "1" sysinfo = "0.30" tracing-appender = "0.2" -wgpu = "0.19" +wgpu = "0.20" [target.'cfg(target_arch = "wasm32")'.dependencies] chrono = { version = "0.4", default-features = false, features = [