diff --git a/Cargo.lock b/Cargo.lock index 3514a99e..40293e3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,9 +146,9 @@ checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "app-surface" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e72a177a573a4531475efeb346ad9c9d8af7586554ac661d765cb81ba07e7a" +checksum = "c6a2cc419f8ac8daca775090318f58b9556b7e45d4f961e291bc24bd4593af50" dependencies = [ "android_logger", "ash", @@ -162,11 +162,11 @@ dependencies = [ "ndk-sys 0.4.1+23.1.7779620", "objc", "pollster", - "raw-window-handle 0.5.2", + "raw-window-handle", "wasm-bindgen", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -193,12 +193,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -227,14 +221,14 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 1.9.0", + "fastrand 2.0.0", "futures-lite", "slab", ] @@ -465,9 +459,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] @@ -578,46 +572,6 @@ dependencies = [ "libloading 0.7.4", ] -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", - "objc", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -667,7 +621,7 @@ dependencies = [ "rayon", "tobj 2.0.4", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -689,7 +643,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -713,9 +667,9 @@ dependencies = [ [[package]] name = "console_log" -version = "0.2.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" +checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" dependencies = [ "log", "web-sys", @@ -774,18 +728,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", -] - [[package]] name = "coreaudio-rs" version = "0.10.0" @@ -882,41 +824,12 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossfont" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45" -dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys", - "core-graphics 0.22.3", - "core-text", - "dwrote", - "foreign-types 0.5.0", - "freetype-rs", - "libc", - "log", - "objc", - "once_cell", - "pkg-config", - "servo-fontconfig", - "winapi", -] - [[package]] name = "crunchy" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "d3d12" version = "0.6.0" @@ -939,41 +852,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - [[package]] name = "devserver_lib" version = "0.4.2" @@ -1007,20 +885,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - [[package]] name = "either" version = "1.9.0" @@ -1082,16 +946,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - [[package]] name = "exr" version = "1.7.0" @@ -1236,29 +1090,7 @@ dependencies = [ "thiserror", "tobj 2.0.4", "wgpu 0.17.0", - "winit 0.27.5", -] - -[[package]] -name = "freetype-rs" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" -dependencies = [ - "bitflags 1.3.2", - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", + "winit", ] [[package]] @@ -1387,7 +1219,7 @@ dependencies = [ "pollster", "tobj 3.2.5", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -1638,7 +1470,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -1730,12 +1562,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.4.0" @@ -2241,7 +2067,7 @@ dependencies = [ "jni-sys", "ndk-sys 0.4.1+23.1.7779620", "num_enum 0.5.11", - "raw-window-handle 0.5.2", + "raw-window-handle", "thiserror", ] @@ -2251,35 +2077,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "libc", - "log", - "ndk 0.7.0", - "ndk-context", - "ndk-macro", - "ndk-sys 0.4.1+23.1.7779620", - "once_cell", - "parking_lot 0.12.1", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ndk-sys" version = "0.3.0" @@ -2387,16 +2184,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_enum" version = "0.5.11" @@ -2780,7 +2567,7 @@ dependencies = [ "web-sys", "wgpu 0.16.3", "wgpu_glyph", - "winit 0.28.6", + "winit", ] [[package]] @@ -2877,15 +2664,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -2894,9 +2672,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -2904,14 +2682,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3076,15 +2852,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - [[package]] name = "safemem" version = "0.3.3" @@ -3121,18 +2888,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sctk-adwaita" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" -dependencies = [ - "crossfont", - "log", - "smithay-client-toolkit", - "tiny-skia 0.7.0", -] - [[package]] name = "sctk-adwaita" version = "0.5.4" @@ -3143,7 +2898,7 @@ dependencies = [ "log", "memmap2", "smithay-client-toolkit", - "tiny-skia 0.8.4", + "tiny-skia", ] [[package]] @@ -3224,27 +2979,6 @@ dependencies = [ "serde", ] -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - [[package]] name = "sha1" version = "0.6.1" @@ -3405,12 +3139,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "syn" version = "1.0.109" @@ -3500,7 +3228,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3514,21 +3242,6 @@ dependencies = [ "weezl", ] -[[package]] -name = "tiny-skia" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "bytemuck", - "cfg-if", - "png", - "safe_arch", - "tiny-skia-path 0.7.0", -] - [[package]] name = "tiny-skia" version = "0.8.4" @@ -3536,21 +3249,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "bytemuck", "cfg-if", "png", - "tiny-skia-path 0.8.4", -] - -[[package]] -name = "tiny-skia-path" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" -dependencies = [ - "arrayref", - "bytemuck", + "tiny-skia-path", ] [[package]] @@ -3704,7 +3407,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3731,7 +3434,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3758,7 +3461,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3786,7 +3489,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3813,7 +3516,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3831,7 +3534,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3851,7 +3554,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3875,7 +3578,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3900,7 +3603,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3926,7 +3629,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3952,7 +3655,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -3978,7 +3681,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -4005,7 +3708,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -4090,7 +3793,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -4138,7 +3841,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu 0.17.0", - "winit 0.27.5", + "winit", ] [[package]] @@ -4440,14 +4143,14 @@ version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "cfg-if", "js-sys", "log", "naga 0.12.3", "parking_lot 0.12.1", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -4464,14 +4167,14 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7472f3b69449a8ae073f6ec41d05b6f846902d92a6c45313c50cb25857b736ce" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "cfg-if", "js-sys", "log", "naga 0.13.0", "parking_lot 0.12.1", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -4488,7 +4191,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bit-vec", "bitflags 2.3.3", "codespan-reporting", @@ -4496,7 +4199,7 @@ dependencies = [ "naga 0.12.3", "parking_lot 0.12.1", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", @@ -4511,7 +4214,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecf7454d9386f602f7399225c92dd2fbdcde52c519bc8fb0bd6fbeb388075dc2" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bit-vec", "bitflags 2.3.3", "codespan-reporting", @@ -4519,7 +4222,7 @@ dependencies = [ "naga 0.13.0", "parking_lot 0.12.1", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", @@ -4535,7 +4238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" dependencies = [ "android_system_properties", - "arrayvec 0.7.4", + "arrayvec", "ash", "bit-set", "bitflags 2.3.3", @@ -4559,7 +4262,7 @@ dependencies = [ "parking_lot 0.12.1", "profiling", "range-alloc", - "raw-window-handle 0.5.2", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", @@ -4577,7 +4280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6654a13885a17f475e8324efb46dc6986d7aaaa98353330f8de2077b153d0101" dependencies = [ "android_system_properties", - "arrayvec 0.7.4", + "arrayvec", "ash", "bit-set", "bitflags 2.3.3", @@ -4600,7 +4303,7 @@ dependencies = [ "parking_lot 0.12.1", "profiling", "range-alloc", - "raw-window-handle 0.5.2", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", @@ -4714,19 +4417,6 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -4787,12 +4477,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.37.0" @@ -4811,12 +4495,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[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_gnu" version = "0.37.0" @@ -4835,12 +4513,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.37.0" @@ -4859,12 +4531,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[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_gnu" version = "0.37.0" @@ -4895,12 +4561,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.37.0" @@ -4921,42 +4581,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winit" -version = "0.27.5" +version = "0.28.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" -dependencies = [ - "bitflags 1.3.2", - "cocoa", - "core-foundation", - "core-graphics 0.22.3", - "dispatch", - "instant", - "libc", - "log", - "mio", - "ndk 0.7.0", - "ndk-glue", - "objc", - "once_cell", - "parking_lot 0.12.1", - "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", - "sctk-adwaita 0.4.3", - "smithay-client-toolkit", - "wasm-bindgen", - "wayland-client", - "wayland-protocols", - "web-sys", - "windows-sys 0.36.1", - "x11-dl", -] - -[[package]] -name = "winit" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ "android-activity", "bitflags 1.3.2", @@ -4973,9 +4600,9 @@ dependencies = [ "once_cell", "orbclient", "percent-encoding", - "raw-window-handle 0.5.2", + "raw-window-handle", "redox_syscall 0.3.5", - "sctk-adwaita 0.5.4", + "sctk-adwaita", "smithay-client-toolkit", "wasm-bindgen", "wayland-client", @@ -5005,15 +4632,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - [[package]] name = "x11-dl" version = "2.21.0" diff --git a/Cargo.toml b/Cargo.toml index c8700cfc..ab1a8e9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,10 +24,9 @@ version = "0.24" default-features = false [workspace.dependencies] -app-surface = "0.3.1" +app-surface = "0.3.3" # app-surface = { git = "https://github.com/jinleili/wgpu-in-app", rev = "0dcf485" } -# app-surface = { path = "../idroid/wgpu-in-app/app-surface", default-features = false } -bytemuck = { version = "1.13", features = ["derive"] } +bytemuck = { version = "1.14", features = ["derive"] } cfg-if = "1" glam = "0.24" env_logger = "0.10" @@ -36,16 +35,16 @@ instant = "0.1" log = "0.4" naga = { version = "0.13" } pollster = "0.3" -rayon = "1.4" +rayon = "1.8" tobj = "3.2" -winit = "0.27.5" +winit = "0.28.7" wgpu = { version = "0.17" } # wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "757245cd" } utils = { path = "code/utils" } # wasm32 dependencies console_error_panic_hook = "0.1.7" -console_log = "0.2.0" +console_log = "1.0" reqwest = { version = "0.11" } js-sys = "0.3.64" wasm-bindgen = "0.2.87" @@ -54,7 +53,7 @@ web-sys = "0.3.64" # build-dependencies anyhow = "1.0" -fs_extra = "1.2" +fs_extra = "1.3" glob = "0.3" [profile.release] diff --git a/code/showcase/compute/Cargo.toml b/code/showcase/compute/Cargo.toml index 7089170c..da69b12a 100644 --- a/code/showcase/compute/Cargo.toml +++ b/code/showcase/compute/Cargo.toml @@ -12,7 +12,7 @@ env_logger.workspace = true pollster.workspace = true image = "0.24" log = "0.4" -rayon = "1.4" +rayon.workspace = true tobj = "2.0" wgpu.workspace = true winit.workspace = true @@ -21,6 +21,6 @@ winit.workspace = true anyhow.workspace = true fs_extra.workspace = true glob.workspace = true -rayon = "1.4" +rayon.workspace = true # naga 的接口有变化,用新版本得修改 build.rs naga = { version = "0.11", features = ["glsl-in", "spv-out", "wgsl-out"] } diff --git a/code/showcase/framework/Cargo.toml b/code/showcase/framework/Cargo.toml index 541d2a37..38659246 100644 --- a/code/showcase/framework/Cargo.toml +++ b/code/showcase/framework/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] anyhow = "1.0" thiserror = "1.0" -bytemuck = { version = "1.13", features = [ "derive" ] } +bytemuck = { version = "1.14", features = [ "derive" ] } glam.workspace = true env_logger = "0.10" pollster = "0.3" @@ -18,8 +18,8 @@ wgpu.workspace = true winit.workspace = true [build-dependencies] -anyhow = "1.0" -fs_extra = "1.2" +anyhow.workspace = true +fs_extra.workspace = true glob = "0.3" naga = { version = "0.9", features = ["glsl-in", "spv-out", "wgsl-out"]} -rayon = "1.5" \ No newline at end of file +rayon.workspace = true \ No newline at end of file diff --git a/code/showcase/gifs/Cargo.toml b/code/showcase/gifs/Cargo.toml index 318002e9..bbfb2089 100644 --- a/code/showcase/gifs/Cargo.toml +++ b/code/showcase/gifs/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] anyhow.workspace = true -bytemuck = { version = "1.13", features = ["derive"] } +bytemuck = { version = "1.14", features = ["derive"] } glam.workspace = true env_logger = "0.10" pollster = "0.3" diff --git a/code/showcase/pong/Cargo.toml b/code/showcase/pong/Cargo.toml index a58f646c..0370ce74 100644 --- a/code/showcase/pong/Cargo.toml +++ b/code/showcase/pong/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] cfg-if = "1" env_logger.workspace = true -winit = "0.28" +winit = "0.28.7" anyhow.workspace = true bytemuck = { workspace = true, features = ["derive"] } cgmath = "0.18" @@ -39,6 +39,6 @@ wgpu = { version = "0.16", features = ["spirv", "webgl"] } anyhow.workspace = true fs_extra.workspace = true glob.workspace = true -rayon = "1.4" +rayon.workspace = true # naga 的接口有变化,用新版本得修改 build.rs naga = { version = "0.11", features = ["glsl-in", "spv-out", "wgsl-out"] } diff --git a/code/showcase/threading/Cargo.toml b/code/showcase/threading/Cargo.toml index 35a029e7..486007cc 100644 --- a/code/showcase/threading/Cargo.toml +++ b/code/showcase/threading/Cargo.toml @@ -15,7 +15,7 @@ glam.workspace = true env_logger.workspace = true pollster.workspace = true log = "0.4" -rayon = "1.4" # NEW! +rayon.workspace = true tobj = { version = "3.2", features = ["async"] } wgpu.workspace = true winit.workspace = true diff --git a/docs/beginner/tutorial1-window.md b/docs/beginner/tutorial1-window.md index 2bf53897..254b8de1 100644 --- a/docs/beginner/tutorial1-window.md +++ b/docs/beginner/tutorial1-window.md @@ -8,7 +8,7 @@ ```toml [dependencies] -winit = "0.27.5" +winit = "0.28.7" env_logger = "0.10" log = "0.4" wgpu = "0.17" @@ -118,7 +118,7 @@ cfg-if = "1" [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.7" -console_log = "0.2.0" +console_log = "1.0" wasm-bindgen = "0.2.87" wasm-bindgen-futures = "0.4.34" web-sys = { version = "0.3.64", features = [ diff --git a/docs/beginner/tutorial2-surface/index.md b/docs/beginner/tutorial2-surface/index.md index 3c1f6baf..13e1ac54 100644 --- a/docs/beginner/tutorial2-surface/index.md +++ b/docs/beginner/tutorial2-surface/index.md @@ -253,7 +253,7 @@ WASM 环境中不能在异步函数里使用 `block_on`。`Future`(异步函 ```toml [dependencies] cfg-if = "1" -winit = "0.27.5" +winit = "0.28.7" env_logger = "0.10" log = "0.4" wgpu = "0.17" @@ -261,7 +261,7 @@ pollster = "0.3" [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.7" -console_log = "0.2.0" +console_log = "1.0" wasm-bindgen = "0.2.87" wasm-bindgen-futures = "0.4.34" web-sys = { version = "0.3.64", features = [ diff --git a/docs/beginner/tutorial4-buffer/index.md b/docs/beginner/tutorial4-buffer/index.md index 888f31d0..20743db9 100644 --- a/docs/beginner/tutorial4-buffer/index.md +++ b/docs/beginner/tutorial4-buffer/index.md @@ -78,7 +78,7 @@ use wgpu::util::DeviceExt; 你应该注意到我们使用了 [bytemuck](https://docs.rs/bytemuck/1.2.0/bytemuck/) 来将 `VERTICES` 转换为 `&[u8]`。`create_buffer_init()` 函数的参数类型是 `&[u8]`,而 `bytemuck::cast_slice` 为我们实现了此类型转换。为此需在 `Cargo.toml` 中添加以下依赖项: ```toml -bytemuck = { version = "1.13", features = [ "derive" ] } +bytemuck = { version = "1.14", features = [ "derive" ] } ``` 我们还需要实现两个 trait 来使 `bytemuck` 工作。它们是 [bytemuck::Pod](https://docs.rs/bytemuck/1.3.0/bytemuck/trait.Pod.html) 和 [bytemuck::Zeroable](https://docs.rs/bytemuck/1.3.0/bytemuck/trait.Zeroable.html)。 `Pod` 表示 `Vertex` 是 ["Plain Old Data"]() 数据类型,因此可以被解释为 `&[u8]` 类型。`Zeroable` 表示可以对其使用 `std::mem::zeroed()`。下面修改 `Vertex` 结构体来派生这些 trait: diff --git a/docs/beginner/tutorial5-textures/index.md b/docs/beginner/tutorial5-textures/index.md index 2497a2db..e8395e30 100644 --- a/docs/beginner/tutorial5-textures/index.md +++ b/docs/beginner/tutorial5-textures/index.md @@ -433,12 +433,12 @@ const VERTICES: &[Vertex] = &[ [dependencies] image = "0.23" glam = "0.24" -winit = "0.27.5" +winit = "0.28.7" env_logger = "0.10" log = "0.4" pollster = "0.3" wgpu = "0.17" -bytemuck = { version = "1.13", features = [ "derive" ] } +bytemuck = { version = "1.14", features = [ "derive" ] } anyhow = "1.0" # NEW! ``` diff --git a/docs/beginner/tutorial9-models/index.md b/docs/beginner/tutorial9-models/index.md index 13626315..fa62b97f 100644 --- a/docs/beginner/tutorial9-models/index.md +++ b/docs/beginner/tutorial9-models/index.md @@ -126,7 +126,7 @@ fn main() -> Result<()> { ```toml [build-dependencies] anyhow = "1.0" -fs_extra = "1.2" +fs_extra = "1.3" glob = "0.3" ``` diff --git a/docs/showcase/pong/index.md b/docs/showcase/pong/index.md index 9918dd60..6995a933 100644 --- a/docs/showcase/pong/index.md +++ b/docs/showcase/pong/index.md @@ -264,9 +264,9 @@ In order for wasm-pack to work properly I first needed to add some dependencies: [dependencies] cfg-if = "1" env_logger = "0.10" -winit = "0.28" +winit = "0.28.7" anyhow = "1.0" -bytemuck = { version = "1.12", features = [ "derive" ] } +bytemuck = { version = "1.14", features = [ "derive" ] } cgmath = "0.18" pollster = "0.3" wgpu = { version = "0.16", features = ["spirv"]} @@ -292,9 +292,9 @@ wgpu = { version = "0.16", features = ["spirv", "webgl"]} [build-dependencies] anyhow = "1.0" -fs_extra = "1.2" +fs_extra = "1.3" glob = "0.3" -rayon = "1.4" +rayon = "1.8" naga = { version = "0.11", features = ["glsl-in", "spv-out", "wgsl-out"]} ```