From 2941cf7cd92bdaa9e20edb6514c62e220bc5fbd8 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Wed, 4 Aug 2021 16:25:23 +0200 Subject: [PATCH] Updated dependencies where I can just change the number (not "tobj" and "gif") ("compute" can't start a trace) (didn't touch "pong" and "imgui-demo") --- Cargo.lock | 656 +++--------------- code/beginner/tutorial1-window/Cargo.toml | 2 +- code/beginner/tutorial2-swapchain/Cargo.toml | 2 +- code/beginner/tutorial3-pipeline/Cargo.toml | 3 +- code/beginner/tutorial4-buffer/Cargo.toml | 2 +- code/beginner/tutorial5-textures/Cargo.toml | 2 +- code/beginner/tutorial6-uniforms/Cargo.toml | 2 +- code/beginner/tutorial7-instancing/Cargo.toml | 2 +- code/beginner/tutorial8-depth/Cargo.toml | 2 +- code/beginner/tutorial9-models/Cargo.toml | 4 +- .../tutorial10-lighting/Cargo.toml | 4 +- .../tutorial11-normals/Cargo.toml | 2 +- .../intermediate/tutorial12-camera/Cargo.toml | 2 +- .../tutorial13-threading/Cargo.toml | 2 +- code/showcase/compute/Cargo.toml | 4 +- code/showcase/framework/Cargo.toml | 4 +- code/showcase/gifs/Cargo.toml | 4 +- docs/beginner/tutorial1-window/README.md | 2 +- docs/beginner/tutorial5-textures/README.md | 6 +- 19 files changed, 133 insertions(+), 574 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b03fee23..e6180182 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "ab_glyph_rasterizer" version = "0.1.3" @@ -61,7 +63,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -105,7 +107,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -116,9 +118,9 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" [[package]] name = "base64" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bit-set" @@ -236,7 +238,7 @@ dependencies = [ "num-integer", "num-traits", "time", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -320,8 +322,8 @@ dependencies = [ "rayon", "shaderc", "tobj 2.0.2", - "wgpu 0.8.1", - "winit 0.25.0", + "wgpu", + "winit", ] [[package]] @@ -504,7 +506,7 @@ checksum = "091ed1b25fe47c7ff129fc440c23650b6114f36aa00bc7212cc8041879294428" dependencies = [ "bitflags", "libloading 0.7.0", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -601,9 +603,9 @@ checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" [[package]] name = "env_logger" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime", @@ -666,9 +668,9 @@ dependencies = [ "shaderc", "thiserror", "tobj 2.0.2", - "wgpu 0.9.0", + "wgpu", "wgpu-subscriber", - "winit 0.24.0", + "winit", ] [[package]] @@ -677,22 +679,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - [[package]] name = "fxhash" version = "0.2.1" @@ -712,7 +698,7 @@ dependencies = [ "libc", "log", "rustc_version", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -726,17 +712,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gfx-auxil" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccf8711c9994dfa34337466bee3ae1462e172874c432ce4eb120ab2e98d39cf" -dependencies = [ - "fxhash", - "gfx-hal 0.8.0", - "spirv_cross", -] - [[package]] name = "gfx-auxil" version = "0.10.0" @@ -744,30 +719,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1694991b11d642680e82075a75c7c2bd75556b805efa7660b705689f05b1ab1c" dependencies = [ "fxhash", - "gfx-hal 0.9.0", - "spirv_cross", -] - -[[package]] -name = "gfx-backend-dx11" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f839f27f8c8a6dc553ccca7f5b35a42009432bc25db9688bba7061cd394161f" -dependencies = [ - "arrayvec", - "bitflags", - "gfx-auxil 0.9.0", - "gfx-hal 0.8.0", - "libloading 0.7.0", - "log", - "parking_lot", - "range-alloc", - "raw-window-handle", - "smallvec", + "gfx-hal", "spirv_cross", - "thunderdome", - "winapi 0.3.9", - "wio", ] [[package]] @@ -778,8 +731,8 @@ checksum = "8f9e453baf3aaef2b0c354ce0b3d63d76402e406a59b64b7182d123cfa6635ae" dependencies = [ "arrayvec", "bitflags", - "gfx-auxil 0.10.0", - "gfx-hal 0.9.0", + "gfx-auxil", + "gfx-hal", "gfx-renderdoc", "libloading 0.7.0", "log", @@ -789,32 +742,10 @@ dependencies = [ "smallvec", "spirv_cross", "thunderdome", - "winapi 0.3.9", + "winapi", "wio", ] -[[package]] -name = "gfx-backend-dx12" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3937738b0da5839bba4e33980d29f9a06dbce184d04a3a08c9a949e7953700e3" -dependencies = [ - "arrayvec", - "bit-set", - "bitflags", - "d3d12", - "gfx-auxil 0.9.0", - "gfx-hal 0.8.0", - "log", - "parking_lot", - "range-alloc", - "raw-window-handle", - "smallvec", - "spirv_cross", - "thunderdome", - "winapi 0.3.9", -] - [[package]] name = "gfx-backend-dx12" version = "0.9.1" @@ -825,8 +756,8 @@ dependencies = [ "bit-set", "bitflags", "d3d12", - "gfx-auxil 0.10.0", - "gfx-hal 0.9.0", + "gfx-auxil", + "gfx-hal", "gfx-renderdoc", "log", "parking_lot", @@ -835,18 +766,7 @@ dependencies = [ "smallvec", "spirv_cross", "thunderdome", - "winapi 0.3.9", -] - -[[package]] -name = "gfx-backend-empty" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac55ada4bfcd35479b3421eea324d36d7da5f724e2f66ecb36d4efdb7041a5e" -dependencies = [ - "gfx-hal 0.8.0", - "log", - "raw-window-handle", + "winapi", ] [[package]] @@ -855,35 +775,11 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29c8f813c47791918aa00dc9c9ddf961d23fa8c2a5d869e6cb8ea84f944820f4" dependencies = [ - "gfx-hal 0.9.0", + "gfx-hal", "log", "raw-window-handle", ] -[[package]] -name = "gfx-backend-gl" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0caa03d6e0b7b4f202aea1f20c3f3288cfa06d92d24cea9d69c9a7627967244a" -dependencies = [ - "arrayvec", - "bitflags", - "fxhash", - "gfx-auxil 0.9.0", - "gfx-hal 0.8.0", - "glow", - "js-sys", - "khronos-egl", - "libloading 0.7.0", - "log", - "naga 0.4.1", - "parking_lot", - "raw-window-handle", - "spirv_cross", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gfx-backend-gl" version = "0.9.0" @@ -893,46 +789,19 @@ dependencies = [ "arrayvec", "bitflags", "fxhash", - "gfx-hal 0.9.0", + "gfx-hal", "glow", "js-sys", "khronos-egl", "libloading 0.7.0", "log", - "naga 0.5.0", + "naga", "parking_lot", "raw-window-handle", "wasm-bindgen", "web-sys", ] -[[package]] -name = "gfx-backend-metal" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "340895ad544ba46433acb3bdabece0ef16f2dbedc030adbd7c9eaf2839fbed41" -dependencies = [ - "arrayvec", - "bitflags", - "block", - "cocoa-foundation", - "copyless", - "foreign-types", - "fxhash", - "gfx-auxil 0.9.0", - "gfx-hal 0.8.0", - "log", - "metal 0.22.0", - "naga 0.4.1", - "objc", - "parking_lot", - "profiling", - "range-alloc", - "raw-window-handle", - "spirv_cross", - "storage-map", -] - [[package]] name = "gfx-backend-metal" version = "0.9.1" @@ -947,10 +816,10 @@ dependencies = [ "core-graphics-types", "foreign-types", "fxhash", - "gfx-hal 0.9.0", + "gfx-hal", "log", - "metal 0.23.0", - "naga 0.5.0", + "metal", + "naga", "objc", "parking_lot", "profiling", @@ -959,27 +828,6 @@ dependencies = [ "storage-map", ] -[[package]] -name = "gfx-backend-vulkan" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a353fc6fdb42ec646de49bbb74e4870e37a7e680caf33f3ac0615c30b1146d94" -dependencies = [ - "arrayvec", - "ash", - "byteorder", - "core-graphics-types", - "gfx-hal 0.8.0", - "inplace_it", - "log", - "naga 0.4.1", - "objc", - "parking_lot", - "raw-window-handle", - "smallvec", - "winapi 0.3.9", -] - [[package]] name = "gfx-backend-vulkan" version = "0.9.0" @@ -990,28 +838,16 @@ dependencies = [ "ash", "byteorder", "core-graphics-types", - "gfx-hal 0.9.0", + "gfx-hal", "gfx-renderdoc", "inplace_it", "log", - "naga 0.5.0", + "naga", "objc", "parking_lot", "raw-window-handle", "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "gfx-hal" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d285bfd566f6b9134af908446ca350c0a1047495dfb9bbd826e701e8ee1d259" -dependencies = [ - "bitflags", - "naga 0.4.1", - "raw-window-handle", - "thiserror", + "winapi", ] [[package]] @@ -1022,7 +858,7 @@ checksum = "7fbb575ea793dd0507b3082f4f2cde62dc9f3cebd98f5cd49ba2a4da97a976fd" dependencies = [ "bitflags", "external-memory", - "naga 0.5.0", + "naga", "raw-window-handle", "thiserror", ] @@ -1064,9 +900,9 @@ dependencies = [ "log", "pollster", "shaderc", - "tobj 2.0.2", - "wgpu 0.9.0", - "winit 0.25.0", + "tobj 3.1.0", + "wgpu", + "winit", ] [[package]] @@ -1196,15 +1032,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485" -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - [[package]] name = "itoa" version = "0.4.6" @@ -1245,16 +1072,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "khronos-egl" version = "4.1.0" @@ -1271,12 +1088,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" - [[package]] name = "libc" version = "0.2.95" @@ -1289,7 +1100,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cadb8e769f070c45df05c78c7520eb4cd17061d4ab262e43cfc68b4d00ac71c" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1299,7 +1110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1387,20 +1198,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "metal" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c12e48c737ee9a55e8bb2352bcde588f79ae308d3529ee888f7cc0f469b5777" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "foreign-types", - "log", - "objc", -] - [[package]] name = "metal" version = "0.23.0" @@ -1424,25 +1221,6 @@ dependencies = [ "adler32", ] -[[package]] -name = "mio" -version = "0.6.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.1", - "net2", - "slab", - "winapi 0.2.8", -] - [[package]] name = "mio" version = "0.7.11" @@ -1451,21 +1229,9 @@ checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" dependencies = [ "libc", "log", - "miow 0.3.7", + "miow", "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.22", - "slab", + "winapi", ] [[package]] @@ -1477,19 +1243,7 @@ dependencies = [ "crossbeam", "crossbeam-queue", "log", - "mio 0.7.11", -] - -[[package]] -name = "miow" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "mio", ] [[package]] @@ -1498,24 +1252,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "naga" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f470a97eafcdd0dbea43d5e1a8ef3557aa31f49ba643d9430dbbf911c162b24c" -dependencies = [ - "bit-set", - "bitflags", - "codespan-reporting", - "fxhash", - "log", - "num-traits", - "petgraph", - "spirv_headers", - "thiserror", + "winapi", ] [[package]] @@ -1536,18 +1273,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "ndk" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73" -dependencies = [ - "jni-sys", - "ndk-sys", - "num_enum 0.4.3", - "thiserror", -] - [[package]] name = "ndk" version = "0.3.0" @@ -1556,24 +1281,10 @@ checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" dependencies = [ "jni-sys", "ndk-sys", - "num_enum 0.5.1", + "num_enum", "thiserror", ] -[[package]] -name = "ndk-glue" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.2.1", - "ndk-macro", - "ndk-sys", -] - [[package]] name = "ndk-glue" version = "0.3.0" @@ -1583,7 +1294,7 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk 0.3.0", + "ndk", "ndk-macro", "ndk-sys", ] @@ -1607,17 +1318,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" -[[package]] -name = "net2" -version = "0.2.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - [[package]] name = "nix" version = "0.18.0" @@ -1646,7 +1346,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1700,16 +1400,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" -dependencies = [ - "derivative", - "num_enum_derive 0.4.3", -] - [[package]] name = "num_enum" version = "0.5.1" @@ -1717,19 +1407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" dependencies = [ "derivative", - "num_enum_derive 0.5.1", -] - -[[package]] -name = "num_enum_derive" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", + "num_enum_derive", ] [[package]] @@ -1801,7 +1479,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1959,9 +1637,9 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" [[package]] name = "ron" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a58080b7bb83b2ea28c3b7a9a994fd5e310330b7c8ca5258d99b98128ecfe4" +checksum = "064ea8613fb712a19faf920022ec8ddf134984f100090764a4e1d768f3827f1f" dependencies = [ "base64", "bitflags", @@ -2105,12 +1783,6 @@ dependencies = [ "loom", ] -[[package]] -name = "slab" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - [[package]] name = "slotmap" version = "0.4.0" @@ -2226,7 +1898,7 @@ checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" dependencies = [ "libc", "redox_syscall", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2263,7 +1935,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", "wasi", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2274,9 +1946,9 @@ checksum = "6172100cd5b17cdd085c94f261e31101ca31886c86a2337a6687dac6d2fb3cf1" [[package]] name = "tobj" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8985733c6a9b851f289747c1c3ee7a962a642787e248a97b6e04185d8d536d70" +checksum = "89f99c842ccf23791f0d183c69431f4e82844ab3152525abbd99e1f51bec30e1" dependencies = [ "ahash 0.7.4", ] @@ -2379,8 +2051,8 @@ dependencies = [ "image", "log", "pollster", - "wgpu 0.9.0", - "winit 0.25.0", + "wgpu", + "winit", ] [[package]] @@ -2396,9 +2068,9 @@ dependencies = [ "image", "log", "pollster", - "tobj 3.0.1", - "wgpu 0.8.1", - "winit 0.25.0", + "tobj 3.1.0", + "wgpu", + "winit", ] [[package]] @@ -2414,9 +2086,9 @@ dependencies = [ "image", "log", "pollster", - "tobj 3.0.1", - "wgpu 0.9.0", - "winit 0.25.0", + "tobj 3.1.0", + "wgpu", + "winit", ] [[package]] @@ -2432,9 +2104,9 @@ dependencies = [ "image", "log", "pollster", - "tobj 3.0.1", - "wgpu 0.9.0", - "winit 0.25.0", + "tobj 3.1.0", + "wgpu", + "winit", ] [[package]] @@ -2451,9 +2123,9 @@ dependencies = [ "log", "pollster", "rayon", - "tobj 3.0.1", - "wgpu 0.9.0", - "winit 0.25.0", + "tobj 3.1.0", + "wgpu", + "winit", ] [[package]] @@ -2465,8 +2137,8 @@ dependencies = [ "image", "log", "pollster", - "wgpu 0.9.0", - "winit 0.25.0", + "wgpu", + "winit", ] [[package]] @@ -2481,8 +2153,8 @@ dependencies = [ "image", "log", "pollster", - "wgpu 0.9.0", - "winit 0.25.0", + "wgpu", + "winit", ] [[package]] @@ -2498,8 +2170,8 @@ dependencies = [ "image", "log", "pollster", - "wgpu 0.9.0", - "winit 0.25.0", + "wgpu", + "winit", ] [[package]] @@ -2515,8 +2187,8 @@ dependencies = [ "image", "log", "pollster", - "wgpu 0.9.0", - "winit 0.25.0", + "wgpu", + "winit", ] [[package]] @@ -2532,8 +2204,8 @@ dependencies = [ "image", "log", "pollster", - "wgpu 0.9.0", - "winit 0.25.0", + "wgpu", + "winit", ] [[package]] @@ -2549,8 +2221,8 @@ dependencies = [ "image", "log", "pollster", - "wgpu 0.9.0", - "winit 0.25.0", + "wgpu", + "winit", ] [[package]] @@ -2566,8 +2238,8 @@ dependencies = [ "image", "log", "pollster", - "wgpu 0.9.0", - "winit 0.25.0", + "wgpu", + "winit", ] [[package]] @@ -2583,9 +2255,9 @@ dependencies = [ "image", "log", "pollster", - "tobj 3.0.1", - "wgpu 0.8.1", - "winit 0.25.0", + "tobj 3.1.0", + "wgpu", + "winit", ] [[package]] @@ -2613,7 +2285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -2772,27 +2444,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "wgpu" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215fd50e66f794bd16683e7e0e0b9b53be265eb10fdf02276caf5de3e5743fcf" -dependencies = [ - "arrayvec", - "js-sys", - "log", - "naga 0.4.1", - "parking_lot", - "raw-window-handle", - "serde", - "smallvec", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core 0.8.1", - "wgpu-types 0.8.0", -] - [[package]] name = "wgpu" version = "0.9.0" @@ -2802,47 +2453,16 @@ dependencies = [ "arrayvec", "js-sys", "log", - "naga 0.5.0", + "naga", "parking_lot", "raw-window-handle", + "serde", "smallvec", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 0.9.0", - "wgpu-types 0.9.0", -] - -[[package]] -name = "wgpu-core" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d56c368fc0e6f3927c711d2b55a51ad4321218efc0239c4acf69e456ab70399" -dependencies = [ - "arrayvec", - "bitflags", - "cfg_aliases", - "copyless", - "fxhash", - "gfx-backend-dx11 0.8.0", - "gfx-backend-dx12 0.8.0", - "gfx-backend-empty 0.8.0", - "gfx-backend-gl 0.8.1", - "gfx-backend-metal 0.8.2", - "gfx-backend-vulkan 0.8.0", - "gfx-hal 0.8.0", - "gpu-alloc", - "gpu-descriptor", - "log", - "naga 0.4.1", - "parking_lot", - "profiling", - "raw-window-handle", - "ron", - "serde", - "smallvec", - "thiserror", - "wgpu-types 0.8.0", + "wgpu-core", + "wgpu-types", ] [[package]] @@ -2856,23 +2476,25 @@ dependencies = [ "cfg_aliases", "copyless", "fxhash", - "gfx-backend-dx11 0.9.0", - "gfx-backend-dx12 0.9.1", - "gfx-backend-empty 0.9.0", - "gfx-backend-gl 0.9.0", - "gfx-backend-metal 0.9.1", - "gfx-backend-vulkan 0.9.0", - "gfx-hal 0.9.0", + "gfx-backend-dx11", + "gfx-backend-dx12", + "gfx-backend-empty", + "gfx-backend-gl", + "gfx-backend-metal", + "gfx-backend-vulkan", + "gfx-hal", "gpu-alloc", "gpu-descriptor", "log", - "naga 0.5.0", + "naga", "parking_lot", "profiling", "raw-window-handle", + "ron", + "serde", "smallvec", "thiserror", - "wgpu-types 0.9.0", + "wgpu-types", ] [[package]] @@ -2888,16 +2510,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "wgpu-types" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa248d90c8e6832269b8955bf800e8241f942c25e18a235b7752226804d21556" -dependencies = [ - "bitflags", - "serde", -] - [[package]] name = "wgpu-types" version = "0.9.0" @@ -2905,14 +2517,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f5c9678cd533558e28b416d66947b099742df1939307478db54f867137f1b60" dependencies = [ "bitflags", + "serde", ] -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -2923,12 +2530,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -2941,7 +2542,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2959,39 +2560,8 @@ dependencies = [ "pollster", "raw-window-handle", "shaderc", - "wgpu 0.9.0", - "winit 0.25.0", -] - -[[package]] -name = "winit" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597" -dependencies = [ - "bitflags", - "cocoa", - "core-foundation 0.9.0", - "core-graphics 0.22.1", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "mio 0.6.22", - "mio-extras", - "ndk 0.2.1", - "ndk-glue 0.2.1", - "ndk-sys", - "objc", - "parking_lot", - "percent-encoding", - "raw-window-handle", - "smithay-client-toolkit", - "wayland-client", - "winapi 0.3.9", - "x11-dl", + "wgpu", + "winit", ] [[package]] @@ -3010,10 +2580,10 @@ dependencies = [ "lazy_static", "libc", "log", - "mio 0.7.11", + "mio", "mio-misc", - "ndk 0.3.0", - "ndk-glue 0.3.0", + "ndk", + "ndk-glue", "ndk-sys", "objc", "parking_lot", @@ -3022,7 +2592,7 @@ dependencies = [ "scopeguard", "smithay-client-toolkit", "wayland-client", - "winapi 0.3.9", + "winapi", "x11-dl", ] @@ -3032,17 +2602,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", + "winapi", ] [[package]] diff --git a/code/beginner/tutorial1-window/Cargo.toml b/code/beginner/tutorial1-window/Cargo.toml index ab6e4b84..a4dff8e0 100644 --- a/code/beginner/tutorial1-window/Cargo.toml +++ b/code/beginner/tutorial1-window/Cargo.toml @@ -15,7 +15,7 @@ path = "src/main.rs" image = "0.23" winit = "0.25" cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" log = "0.4" wgpu = "0.9" pollster = "0.2" diff --git a/code/beginner/tutorial2-swapchain/Cargo.toml b/code/beginner/tutorial2-swapchain/Cargo.toml index 17547b14..8e6f739f 100644 --- a/code/beginner/tutorial2-swapchain/Cargo.toml +++ b/code/beginner/tutorial2-swapchain/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" image = "0.23" winit = "0.25" cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" log = "0.4" wgpu = "0.9" pollster = "0.2" diff --git a/code/beginner/tutorial3-pipeline/Cargo.toml b/code/beginner/tutorial3-pipeline/Cargo.toml index 19d8919c..65fc9e93 100644 --- a/code/beginner/tutorial3-pipeline/Cargo.toml +++ b/code/beginner/tutorial3-pipeline/Cargo.toml @@ -7,9 +7,8 @@ edition = "2018" [dependencies] image = "0.23" winit = "0.25" -# shaderc = "0.7" # REMOVED! cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" log = "0.4" wgpu = "0.9" pollster = "0.2" diff --git a/code/beginner/tutorial4-buffer/Cargo.toml b/code/beginner/tutorial4-buffer/Cargo.toml index a80ae356..6f7882ab 100644 --- a/code/beginner/tutorial4-buffer/Cargo.toml +++ b/code/beginner/tutorial4-buffer/Cargo.toml @@ -10,7 +10,7 @@ image = "0.23" cgmath = "0.18" winit = "0.25" wgpu = "0.9" -env_logger = "0.8" +env_logger = "0.9" log = "0.4" pollster = "0.2" # NEW! diff --git a/code/beginner/tutorial5-textures/Cargo.toml b/code/beginner/tutorial5-textures/Cargo.toml index f80793af..03c4d6dd 100644 --- a/code/beginner/tutorial5-textures/Cargo.toml +++ b/code/beginner/tutorial5-textures/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" log = "0.4" pollster = "0.2" image = "0.23" diff --git a/code/beginner/tutorial6-uniforms/Cargo.toml b/code/beginner/tutorial6-uniforms/Cargo.toml index bb2f25ca..8c67c325 100644 --- a/code/beginner/tutorial6-uniforms/Cargo.toml +++ b/code/beginner/tutorial6-uniforms/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" log = "0.4" pollster = "0.2" image = "0.23" diff --git a/code/beginner/tutorial7-instancing/Cargo.toml b/code/beginner/tutorial7-instancing/Cargo.toml index 4701f3ad..b5f82d51 100644 --- a/code/beginner/tutorial7-instancing/Cargo.toml +++ b/code/beginner/tutorial7-instancing/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" log = "0.4" pollster = "0.2" image = "0.23" diff --git a/code/beginner/tutorial8-depth/Cargo.toml b/code/beginner/tutorial8-depth/Cargo.toml index 6ff85980..4d110474 100644 --- a/code/beginner/tutorial8-depth/Cargo.toml +++ b/code/beginner/tutorial8-depth/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" pollster = "0.2" image = "0.23" log = "0.4" diff --git a/code/beginner/tutorial9-models/Cargo.toml b/code/beginner/tutorial9-models/Cargo.toml index 90c8995c..c12e7b26 100644 --- a/code/beginner/tutorial9-models/Cargo.toml +++ b/code/beginner/tutorial9-models/Cargo.toml @@ -8,12 +8,12 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" pollster = "0.2" image = "0.23" log = "0.4" tobj = "3.0" -wgpu = {version = "0.8", features = [ "cross" ]} +wgpu = "0.9" winit = "0.25" [build-dependencies] diff --git a/code/intermediate/tutorial10-lighting/Cargo.toml b/code/intermediate/tutorial10-lighting/Cargo.toml index 1bc5b5f1..cceaa11b 100644 --- a/code/intermediate/tutorial10-lighting/Cargo.toml +++ b/code/intermediate/tutorial10-lighting/Cargo.toml @@ -8,12 +8,12 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" pollster = "0.2" image = "0.23" log = "0.4" tobj = "3.0" -wgpu = { version = "0.8", features = ["cross"]} +wgpu = "0.9" winit = "0.25" [build-dependencies] diff --git a/code/intermediate/tutorial11-normals/Cargo.toml b/code/intermediate/tutorial11-normals/Cargo.toml index 9e8d818b..1a10b700 100644 --- a/code/intermediate/tutorial11-normals/Cargo.toml +++ b/code/intermediate/tutorial11-normals/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" pollster = "0.2" image = "0.23" log = "0.4" diff --git a/code/intermediate/tutorial12-camera/Cargo.toml b/code/intermediate/tutorial12-camera/Cargo.toml index 5dc25e1c..39e24395 100644 --- a/code/intermediate/tutorial12-camera/Cargo.toml +++ b/code/intermediate/tutorial12-camera/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" pollster = "0.2" image = "0.23" log = "0.4" diff --git a/code/intermediate/tutorial13-threading/Cargo.toml b/code/intermediate/tutorial13-threading/Cargo.toml index 5e454f11..cb2949a5 100644 --- a/code/intermediate/tutorial13-threading/Cargo.toml +++ b/code/intermediate/tutorial13-threading/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" pollster = "0.2" image = "0.23" log = "0.4" diff --git a/code/showcase/compute/Cargo.toml b/code/showcase/compute/Cargo.toml index 9a291f0e..4c4afb5f 100644 --- a/code/showcase/compute/Cargo.toml +++ b/code/showcase/compute/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = ["derive"]} cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" pollster = "0.2" image = "0.23" log = "0.4" rayon = "1.4" tobj = "2.0" -wgpu = { version = "0.8", features = ["trace", "cross"] } +wgpu = { version = "0.9", features = ["trace"] } winit = "0.25" [build-dependencies] diff --git a/code/showcase/framework/Cargo.toml b/code/showcase/framework/Cargo.toml index 87cfe7ba..17a8feb9 100644 --- a/code/showcase/framework/Cargo.toml +++ b/code/showcase/framework/Cargo.toml @@ -9,14 +9,14 @@ anyhow = "1.0" thiserror = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" pollster = "0.2" image = "0.23" log = "0.4" tobj = "2.0" wgpu = "0.9" wgpu-subscriber = "0.1" -winit = "0.24" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/showcase/gifs/Cargo.toml b/code/showcase/gifs/Cargo.toml index c40699be..48138835 100644 --- a/code/showcase/gifs/Cargo.toml +++ b/code/showcase/gifs/Cargo.toml @@ -9,11 +9,11 @@ edition = "2018" anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" pollster = "0.2" image = "0.23" log = "0.4" -tobj = "2.0" +tobj = "3.1" wgpu = "0.9" winit = "0.25" gif = "0.10.3" diff --git a/docs/beginner/tutorial1-window/README.md b/docs/beginner/tutorial1-window/README.md index c486d99d..95fccc10 100644 --- a/docs/beginner/tutorial1-window/README.md +++ b/docs/beginner/tutorial1-window/README.md @@ -11,7 +11,7 @@ For the beginner stuff, we're going to keep things very simple, we'll add things image = "0.23" winit = "0.25" cgmath = "0.18" -env_logger = "0.8" +env_logger = "0.9" log = "0.4" wgpu = "0.9" pollster = "0.2" diff --git a/docs/beginner/tutorial5-textures/README.md b/docs/beginner/tutorial5-textures/README.md index 91e29b4c..aa812a5f 100644 --- a/docs/beginner/tutorial5-textures/README.md +++ b/docs/beginner/tutorial5-textures/README.md @@ -431,11 +431,11 @@ For convenience sake, let's pull our texture code into its module. We'll first n image = "0.23" cgmath = "0.18" winit = "0.25" -env_logger = "0.8" +env_logger = "0.9" log = "0.4" pollster = "0.2" -wgpu ="0.6" -bytemuck = "1.4" +wgpu = "0.9" +bytemuck = { version = "1.4", features = [ "derive" ] } anyhow = "1.0" // NEW! ```