From b5ce220c2bd735e2bc7109c6fc564b3bc3636a2e Mon Sep 17 00:00:00 2001 From: Ben Hansen Date: Sat, 19 Jun 2021 16:31:49 -0600 Subject: [PATCH] upgraded to 0.9 --- Cargo.lock | 1025 ++++++----------- Cargo.toml | 4 + code/beginner/tutorial1-window/Cargo.toml | 4 +- code/beginner/tutorial2-swapchain/Cargo.toml | 4 +- code/beginner/tutorial3-pipeline/Cargo.toml | 4 +- code/beginner/tutorial4-buffer/Cargo.toml | 4 +- code/beginner/tutorial5-textures/Cargo.toml | 4 +- code/beginner/tutorial6-uniforms/Cargo.toml | 4 +- code/beginner/tutorial7-instancing/Cargo.toml | 4 +- code/beginner/tutorial8-depth/Cargo.toml | 4 +- code/beginner/tutorial9-models/Cargo.toml | 2 +- .../tutorial10-lighting/Cargo.toml | 2 +- .../tutorial11-normals/Cargo.toml | 4 +- .../intermediate/tutorial12-camera/Cargo.toml | 4 +- .../tutorial13-threading/Cargo.toml | 4 +- code/showcase/compute/Cargo.toml | 2 +- code/showcase/framework/Cargo.toml | 2 +- code/showcase/gifs/Cargo.toml | 4 +- code/showcase/imgui-demo/Cargo.toml | 2 +- code/showcase/pong/Cargo.toml | 2 +- code/showcase/windowless/Cargo.toml | 4 +- docs/beginner/tutorial1-window/README.md | 4 +- docs/beginner/tutorial5-textures/README.md | 2 +- 23 files changed, 387 insertions(+), 712 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 248e2a3d..d0468793 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,15 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "ab_glyph" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af0ac006645f86f20f6c6fa4dcaef920bf803df819123626f9440e35835e7d80" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser 0.12.0", -] - [[package]] name = "ab_glyph_rasterizer" version = "0.1.3" @@ -34,7 +24,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" dependencies = [ - "getrandom 0.2.3", + "getrandom", "once_cell", "version_check", ] @@ -52,28 +42,6 @@ dependencies = [ name = "alignment" version = "0.1.0" -[[package]] -name = "alsa" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18" -dependencies = [ - "alsa-sys", - "bitflags", - "libc", - "nix 0.20.0", -] - -[[package]] -name = "alsa-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" -dependencies = [ - "libc", - "pkg-config", -] - [[package]] name = "andrew" version = "0.3.1" @@ -152,25 +120,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" -[[package]] -name = "bindgen" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", -] - [[package]] name = "bit-set" version = "0.5.2" @@ -230,12 +179,6 @@ version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" -[[package]] -name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" - [[package]] name = "calloop" version = "0.6.5" @@ -243,7 +186,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" dependencies = [ "log", - "nix 0.18.0", + "nix", ] [[package]] @@ -255,21 +198,6 @@ dependencies = [ "jobserver", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "0.1.10" @@ -298,12 +226,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "chlorine" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd650552110e39b7c5058986cf177decd3365841836578ac50a286094eac0be6" - [[package]] name = "chrono" version = "0.4.19" @@ -317,23 +239,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "clang-sys" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c" -dependencies = [ - "glob", - "libc", - "libloading 0.7.0", -] - -[[package]] -name = "claxon" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" - [[package]] name = "cloudabi" version = "0.1.0" @@ -399,16 +304,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" -[[package]] -name = "combine" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e" -dependencies = [ - "bytes", - "memchr", -] - [[package]] name = "compute" version = "0.1.0" @@ -425,8 +320,8 @@ dependencies = [ "rayon", "shaderc", "tobj 2.0.2", - "wgpu", - "winit 0.24.0", + "wgpu 0.8.1", + "winit 0.25.0", ] [[package]] @@ -461,12 +356,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - [[package]] name = "core-foundation-sys" version = "0.7.0" @@ -506,9 +395,9 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92f5d519093a4178296707dbaa3880eae85a5ef5386675f361a1cf25376e93c" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ "bitflags", "core-foundation 0.9.0", @@ -529,50 +418,6 @@ dependencies = [ "objc", ] -[[package]] -name = "coreaudio-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" -dependencies = [ - "bitflags", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa" -dependencies = [ - "bindgen", -] - -[[package]] -name = "cpal" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25" -dependencies = [ - "alsa", - "core-foundation-sys 0.6.2", - "coreaudio-rs", - "jni", - "js-sys", - "lazy_static", - "libc", - "mach", - "ndk 0.3.0", - "ndk-glue 0.3.0", - "nix 0.20.0", - "oboe", - "parking_lot", - "stdweb", - "thiserror", - "web-sys", - "winapi 0.3.9", -] - [[package]] name = "crc32fast" version = "1.2.0" @@ -739,6 +584,15 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "drm-fourcc" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebbf3a5ed4671aabffefce172ff43d69c1f27dd2c6aea28e5212a70f32ada0cf" +dependencies = [ + "serde", +] + [[package]] name = "either" version = "1.5.3" @@ -758,6 +612,16 @@ dependencies = [ "termcolor", ] +[[package]] +name = "external-memory" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4dfe8d292b014422776a8c516862d2bff8a81b223a4461dfdc45f3862dc9d39" +dependencies = [ + "bitflags", + "drm-fourcc", +] + [[package]] name = "fixedbitset" version = "0.2.0" @@ -802,7 +666,7 @@ dependencies = [ "shaderc", "thiserror", "tobj 2.0.2", - "wgpu", + "wgpu 0.9.0", "wgpu-subscriber", "winit 0.24.0", ] @@ -946,17 +810,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.3" @@ -965,7 +818,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -975,7 +828,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ccf8711c9994dfa34337466bee3ae1462e172874c432ce4eb120ab2e98d39cf" dependencies = [ "fxhash", - "gfx-hal", + "gfx-hal 0.8.0", + "spirv_cross", +] + +[[package]] +name = "gfx-auxil" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1694991b11d642680e82075a75c7c2bd75556b805efa7660b705689f05b1ab1c" +dependencies = [ + "fxhash", + "gfx-hal 0.9.0", "spirv_cross", ] @@ -987,8 +851,31 @@ checksum = "6f839f27f8c8a6dc553ccca7f5b35a42009432bc25db9688bba7061cd394161f" dependencies = [ "arrayvec", "bitflags", - "gfx-auxil", - "gfx-hal", + "gfx-auxil 0.9.0", + "gfx-hal 0.8.0", + "libloading 0.7.0", + "log", + "parking_lot", + "range-alloc", + "raw-window-handle", + "smallvec", + "spirv_cross", + "thunderdome", + "winapi 0.3.9", + "wio", +] + +[[package]] +name = "gfx-backend-dx11" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9e453baf3aaef2b0c354ce0b3d63d76402e406a59b64b7182d123cfa6635ae" +dependencies = [ + "arrayvec", + "bitflags", + "gfx-auxil 0.10.0", + "gfx-hal 0.9.0", + "gfx-renderdoc", "libloading 0.7.0", "log", "parking_lot", @@ -1011,8 +898,31 @@ dependencies = [ "bit-set", "bitflags", "d3d12", - "gfx-auxil", - "gfx-hal", + "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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f09e9d8c2aa69e9a21eb83c0f5d1a286c6d37da011f796e550d180b08090ce" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags", + "d3d12", + "gfx-auxil 0.10.0", + "gfx-hal 0.9.0", + "gfx-renderdoc", "log", "parking_lot", "range-alloc", @@ -1029,7 +939,18 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ac55ada4bfcd35479b3421eea324d36d7da5f724e2f66ecb36d4efdb7041a5e" dependencies = [ - "gfx-hal", + "gfx-hal 0.8.0", + "log", + "raw-window-handle", +] + +[[package]] +name = "gfx-backend-empty" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c8f813c47791918aa00dc9c9ddf961d23fa8c2a5d869e6cb8ea84f944820f4" +dependencies = [ + "gfx-hal 0.9.0", "log", "raw-window-handle", ] @@ -1043,14 +964,14 @@ dependencies = [ "arrayvec", "bitflags", "fxhash", - "gfx-auxil", - "gfx-hal", + "gfx-auxil 0.9.0", + "gfx-hal 0.8.0", "glow", "js-sys", "khronos-egl", "libloading 0.7.0", "log", - "naga", + "naga 0.4.1", "parking_lot", "raw-window-handle", "spirv_cross", @@ -1058,6 +979,28 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gfx-backend-gl" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bae057fc3a0ab23ecf97ae51d4017d27d5ddf0aab16ee6dcb58981af88c3152" +dependencies = [ + "arrayvec", + "bitflags", + "fxhash", + "gfx-hal 0.9.0", + "glow", + "js-sys", + "khronos-egl", + "libloading 0.7.0", + "log", + "naga 0.5.0", + "parking_lot", + "raw-window-handle", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gfx-backend-metal" version = "0.8.2" @@ -1071,11 +1014,11 @@ dependencies = [ "copyless", "foreign-types", "fxhash", - "gfx-auxil", - "gfx-hal", + "gfx-auxil 0.9.0", + "gfx-hal 0.8.0", "log", - "metal", - "naga", + "metal 0.22.0", + "naga 0.4.1", "objc", "parking_lot", "profiling", @@ -1085,6 +1028,32 @@ dependencies = [ "storage-map", ] +[[package]] +name = "gfx-backend-metal" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c10e91bbe274122a9bf196ac16a57dd2db67cd7c4299eeb962503aebacc013" +dependencies = [ + "arrayvec", + "bitflags", + "block", + "cocoa-foundation", + "copyless", + "core-graphics-types", + "foreign-types", + "fxhash", + "gfx-hal 0.9.0", + "log", + "metal 0.23.0", + "naga 0.5.0", + "objc", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "storage-map", +] + [[package]] name = "gfx-backend-vulkan" version = "0.8.0" @@ -1095,10 +1064,32 @@ dependencies = [ "ash", "byteorder", "core-graphics-types", - "gfx-hal", + "gfx-hal 0.8.0", "inplace_it", "log", - "naga", + "naga 0.4.1", + "objc", + "parking_lot", + "raw-window-handle", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "gfx-backend-vulkan" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9861ec855acbbc65c0e4f966d761224886e811dc2c6d413a4776e9293d0e5c0" +dependencies = [ + "arrayvec", + "ash", + "byteorder", + "core-graphics-types", + "gfx-hal 0.9.0", + "gfx-renderdoc", + "inplace_it", + "log", + "naga 0.5.0", "objc", "parking_lot", "raw-window-handle", @@ -1113,11 +1104,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d285bfd566f6b9134af908446ca350c0a1047495dfb9bbd826e701e8ee1d259" dependencies = [ "bitflags", - "naga", + "naga 0.4.1", "raw-window-handle", "thiserror", ] +[[package]] +name = "gfx-hal" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fbb575ea793dd0507b3082f4f2cde62dc9f3cebd98f5cd49ba2a4da97a976fd" +dependencies = [ + "bitflags", + "external-memory", + "naga 0.5.0", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "gfx-renderdoc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8027995e247e2426d3a00d13f5191dd56c314bff02dc4b54cbf727f1ba9c40a" +dependencies = [ + "libloading 0.7.0", + "log", + "renderdoc-sys", +] + [[package]] name = "gif" version = "0.10.3" @@ -1145,8 +1160,8 @@ dependencies = [ "log", "shaderc", "tobj 2.0.2", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -1167,45 +1182,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "glyph_brush" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3f00b8574a76fb6c50890c48da03946ca50e4372a2778737922666a2238221" -dependencies = [ - "glyph_brush_draw_cache", - "glyph_brush_layout", - "log", - "ordered-float", - "rustc-hash", - "twox-hash", -] - -[[package]] -name = "glyph_brush_draw_cache" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2c82074cafb68b9e459c50c655f7eedcb92d6ee7166813802934bc6fc29fa3" -dependencies = [ - "ab_glyph", - "crossbeam-channel", - "crossbeam-deque", - "linked-hash-map", - "rayon", - "rustc-hash", -] - -[[package]] -name = "glyph_brush_layout" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10bc06d530bf20c1902f1b02799ab7372ff43f6119770c49b0bc3f21bd148820" -dependencies = [ - "ab_glyph", - "approx", - "xi-unicode", -] - [[package]] name = "gpu-alloc" version = "0.4.7" @@ -1263,12 +1239,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hound" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" - [[package]] name = "humantime" version = "2.1.0" @@ -1299,63 +1269,6 @@ dependencies = [ "tiff", ] -[[package]] -name = "imgui" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cfcf6e3326886321c5d637caf1ce217006651059015fae372b1c49c0e722b2" -dependencies = [ - "bitflags", - "imgui-sys", - "parking_lot", -] - -[[package]] -name = "imgui-demo" -version = "0.1.0" -dependencies = [ - "anyhow", - "framework", - "futures", - "imgui", - "imgui-wgpu", - "imgui-winit-support", - "wgpu", -] - -[[package]] -name = "imgui-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85ca00be6b78bf02b57e91468cf19d08dfcc11d0fb3c2f3dc491c29404d8d330" -dependencies = [ - "cc", - "chlorine", -] - -[[package]] -name = "imgui-wgpu" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e416ae1d240daa57a0d2a143251e6f925ca3705a1c8f58c986f9a1a17f98b56a" -dependencies = [ - "bytemuck", - "imgui", - "log", - "smallvec", - "wgpu", -] - -[[package]] -name = "imgui-winit-support" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ae881a42852470216c77fba5835b9701815adac24dfaa8d4ebf3a368376756" -dependencies = [ - "imgui", - "winit 0.24.0", -] - [[package]] name = "indexmap" version = "1.6.1" @@ -1393,20 +1306,6 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" -[[package]] -name = "jni" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - [[package]] name = "jni-sys" version = "0.3.0" @@ -1473,17 +1372,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -[[package]] -name = "lewton" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" -dependencies = [ - "byteorder", - "ogg", - "tinyvec", -] - [[package]] name = "libc" version = "0.2.95" @@ -1509,12 +1397,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "linked-hash-map" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" - [[package]] name = "lock_api" version = "0.4.1" @@ -1552,15 +1434,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - [[package]] name = "malloc_buf" version = "0.0.6" @@ -1624,23 +1497,17 @@ dependencies = [ ] [[package]] -name = "minimp3" -version = "0.5.1" +name = "metal" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372" +checksum = "79d7d769f1c104b8388294d6594d491d2e21240636f5f94d37f8a0f3d7904450" dependencies = [ - "minimp3-sys", - "slice-deque", - "thiserror", -] - -[[package]] -name = "minimp3-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" -dependencies = [ - "cc", + "bitflags", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", ] [[package]] @@ -1746,6 +1613,24 @@ dependencies = [ "thiserror", ] +[[package]] +name = "naga" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef670817eef03d356d5a509ea275e7dd3a78ea9e24261ea3cb2dfed1abb08f64" +dependencies = [ + "bit-set", + "bitflags", + "codespan-reporting", + "fxhash", + "log", + "num-traits", + "petgraph", + "rose_tree", + "spirv_headers", + "thiserror", +] + [[package]] name = "ndk" version = "0.2.1" @@ -1840,18 +1725,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", -] - [[package]] name = "nom" version = "5.1.2" @@ -1871,17 +1744,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "num-integer" version = "0.1.43" @@ -1996,69 +1858,19 @@ dependencies = [ "cc", ] -[[package]] -name = "oboe" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa187b38ae20374617b7ad418034ed3dc90ac980181d211518bd03537ae8f8d" -dependencies = [ - "jni", - "ndk 0.3.0", - "ndk-glue 0.3.0", - "num-derive", - "num-traits", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88e64835aa3f579c08d182526dc34e3907343d5b97e87b71a40ba5bca7aca9e" -dependencies = [ - "cc", -] - -[[package]] -name = "ogg" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" -dependencies = [ - "byteorder", -] - [[package]] name = "once_cell" version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" -[[package]] -name = "ordered-float" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f100fcfb41e5385e0991f74981732049f9b896821542a219420491046baafdc2" -dependencies = [ - "num-traits", -] - [[package]] name = "owned_ttf_parser" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3" dependencies = [ - "ttf-parser 0.6.2", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3c7a20e3f122223e68eef6ca58e39bc1ea8a1d83418ba4c2c1ba189d2ee355" -dependencies = [ - "ttf-parser 0.12.1", + "ttf-parser", ] [[package]] @@ -2087,12 +1899,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.1.0" @@ -2153,30 +1959,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "pong" -version = "0.1.0" -dependencies = [ - "anyhow", - "bytemuck", - "cgmath", - "fs_extra", - "futures", - "glob", - "rand 0.8.3", - "rodio", - "shaderc", - "wgpu", - "wgpu_glyph", - "winit 0.25.0", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -2222,87 +2004,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" -dependencies = [ - "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.2", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_hc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -dependencies = [ - "rand_core 0.6.2", -] - [[package]] name = "range-alloc" version = "0.1.1" @@ -2378,17 +2079,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" [[package]] -name = "rodio" -version = "0.14.0" +name = "renderdoc-sys" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9" -dependencies = [ - "claxon", - "cpal", - "hound", - "lewton", - "minimp3", -] +checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" [[package]] name = "ron" @@ -2402,10 +2096,13 @@ dependencies = [ ] [[package]] -name = "rustc-hash" -version = "1.1.0" +name = "rose_tree" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "284de9dae38774e2813aaabd7e947b4a6fe9b8c58c2309f754a487cdd50de1c2" +dependencies = [ + "petgraph", +] [[package]] name = "rustc_version" @@ -2423,7 +2120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59" dependencies = [ "ab_glyph_rasterizer", - "owned_ttf_parser 0.6.0", + "owned_ttf_parser", ] [[package]] @@ -2476,18 +2173,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.114" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.114" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -2535,29 +2232,12 @@ dependencies = [ "loom", ] -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - [[package]] name = "slab" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -[[package]] -name = "slice-deque" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" -dependencies = [ - "libc", - "mach", - "winapi 0.3.9", -] - [[package]] name = "slotmap" version = "0.4.0" @@ -2583,7 +2263,7 @@ dependencies = [ "lazy_static", "log", "memmap2", - "nix 0.18.0", + "nix", "wayland-client", "wayland-cursor", "wayland-protocols", @@ -2610,18 +2290,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stdweb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" - [[package]] name = "storage-map" version = "0.3.0" @@ -2721,25 +2389,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", "winapi 0.3.9", ] -[[package]] -name = "tinyvec" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - [[package]] name = "tobj" version = "2.0.2" @@ -2844,12 +2497,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" -[[package]] -name = "ttf-parser" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc71742ead70703a55d184f82087302f2f9ffa3793e64db46a78bf75dd723f4" - [[package]] name = "tutorial1-window" version = "0.1.0" @@ -2859,8 +2506,8 @@ dependencies = [ "futures", "image", "log", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -2877,8 +2524,8 @@ dependencies = [ "image", "log", "tobj 3.0.1", - "wgpu", - "winit 0.24.0", + "wgpu 0.8.1", + "winit 0.25.0", ] [[package]] @@ -2895,8 +2542,8 @@ dependencies = [ "image", "log", "tobj 3.0.1", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -2913,8 +2560,8 @@ dependencies = [ "image", "log", "tobj 3.0.1", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -2932,8 +2579,8 @@ dependencies = [ "log", "rayon", "tobj 3.0.1", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -2945,8 +2592,8 @@ dependencies = [ "futures", "image", "log", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -2961,8 +2608,8 @@ dependencies = [ "glob", "image", "log", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -2978,8 +2625,8 @@ dependencies = [ "glob", "image", "log", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -2995,8 +2642,8 @@ dependencies = [ "glob", "image", "log", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -3012,8 +2659,8 @@ dependencies = [ "glob", "image", "log", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -3029,8 +2676,8 @@ dependencies = [ "glob", "image", "log", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -3046,8 +2693,8 @@ dependencies = [ "glob", "image", "log", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -3064,19 +2711,8 @@ dependencies = [ "image", "log", "tobj 3.0.1", - "wgpu", - "winit 0.24.0", -] - -[[package]] -name = "twox-hash" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" -dependencies = [ - "cfg-if 0.1.10", - "rand 0.7.3", - "static_assertions", + "wgpu 0.8.1", + "winit 0.25.0", ] [[package]] @@ -3108,12 +2744,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" @@ -3195,7 +2825,7 @@ dependencies = [ "bitflags", "downcast-rs", "libc", - "nix 0.18.0", + "nix", "scoped-tls", "wayland-commons", "wayland-scanner", @@ -3208,7 +2838,7 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230b3ffeda101f877ff8ecb8573f5d26e7beb345b197807c4df34ec06879a3e6" dependencies = [ - "nix 0.18.0", + "nix", "once_cell", "smallvec", "wayland-sys", @@ -3220,7 +2850,7 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0aad1b4301cdccfb5f64056a4736e8155a5f4734bac41fdbca80b1fdbe1ab3e1" dependencies = [ - "nix 0.18.0", + "nix", "wayland-client", "xcursor", ] @@ -3278,7 +2908,7 @@ dependencies = [ "arrayvec", "js-sys", "log", - "naga", + "naga 0.4.1", "parking_lot", "raw-window-handle", "serde", @@ -3286,8 +2916,28 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-types", + "wgpu-core 0.8.1", + "wgpu-types 0.8.0", +] + +[[package]] +name = "wgpu" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd247f8b26fd3d42ef2f320d378025cd6e84d782ef749fab45cc3b981fbe3275" +dependencies = [ + "arrayvec", + "js-sys", + "log", + "naga 0.5.0", + "parking_lot", + "raw-window-handle", + "smallvec", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.9.0", + "wgpu-types 0.9.0", ] [[package]] @@ -3301,17 +2951,17 @@ dependencies = [ "cfg_aliases", "copyless", "fxhash", - "gfx-backend-dx11", - "gfx-backend-dx12", - "gfx-backend-empty", - "gfx-backend-gl", - "gfx-backend-metal", - "gfx-backend-vulkan", - "gfx-hal", + "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", + "naga 0.4.1", "parking_lot", "profiling", "raw-window-handle", @@ -3319,7 +2969,37 @@ dependencies = [ "serde", "smallvec", "thiserror", - "wgpu-types", + "wgpu-types 0.8.0", +] + +[[package]] +name = "wgpu-core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af5c8acd3ae5781a277cdf65a17f3a7135de5ae782775620e74ea16c9d47770" +dependencies = [ + "arrayvec", + "bitflags", + "cfg_aliases", + "copyless", + "fxhash", + "gfx-backend-dx11 0.9.0", + "gfx-backend-dx12 0.9.0", + "gfx-backend-empty 0.9.0", + "gfx-backend-gl 0.9.0", + "gfx-backend-metal 0.9.0", + "gfx-backend-vulkan 0.9.0", + "gfx-hal 0.9.0", + "gpu-alloc", + "gpu-descriptor", + "log", + "naga 0.5.0", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "thiserror", + "wgpu-types 0.9.0", ] [[package]] @@ -3346,15 +3026,12 @@ dependencies = [ ] [[package]] -name = "wgpu_glyph" -version = "0.12.0" +name = "wgpu-types" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634570b440f4c24c2e6049ed01ec832c23d338dea3eca654d5760838017a1c8b" +checksum = "4f5c9678cd533558e28b416d66947b099742df1939307478db54f867137f1b60" dependencies = [ - "bytemuck", - "glyph_brush", - "log", - "wgpu", + "bitflags", ] [[package]] @@ -3409,8 +3086,8 @@ dependencies = [ "image", "raw-window-handle", "shaderc", - "wgpu", - "winit 0.24.0", + "wgpu 0.9.0", + "winit 0.25.0", ] [[package]] @@ -3522,12 +3199,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - [[package]] name = "xml-rs" version = "0.8.3" diff --git a/Cargo.toml b/Cargo.toml index 03a56d14..6bd08932 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,4 +8,8 @@ members = [ # showcase "code/showcase/*", +] +exclude = [ + "code/showcase/imgui-demo", + "code/showcase/pong", ] \ No newline at end of file diff --git a/code/beginner/tutorial1-window/Cargo.toml b/code/beginner/tutorial1-window/Cargo.toml index 74043d29..40a26795 100644 --- a/code/beginner/tutorial1-window/Cargo.toml +++ b/code/beginner/tutorial1-window/Cargo.toml @@ -13,9 +13,9 @@ path = "src/main.rs" [dependencies] image = "0.23" -winit = "0.24" +winit = "0.25" cgmath = "0.18" env_logger = "0.8" log = "0.4" -wgpu = "0.8" +wgpu = "0.9" futures = "0.3" diff --git a/code/beginner/tutorial2-swapchain/Cargo.toml b/code/beginner/tutorial2-swapchain/Cargo.toml index 3dbbf9d9..3e556f29 100644 --- a/code/beginner/tutorial2-swapchain/Cargo.toml +++ b/code/beginner/tutorial2-swapchain/Cargo.toml @@ -8,11 +8,11 @@ edition = "2018" [dependencies] image = "0.23" -winit = "0.24" +winit = "0.25" cgmath = "0.18" env_logger = "0.8" log = "0.4" -wgpu = "0.8" +wgpu = "0.9" futures = "0.3" diff --git a/code/beginner/tutorial3-pipeline/Cargo.toml b/code/beginner/tutorial3-pipeline/Cargo.toml index 3793b0f1..774178d3 100644 --- a/code/beginner/tutorial3-pipeline/Cargo.toml +++ b/code/beginner/tutorial3-pipeline/Cargo.toml @@ -6,12 +6,12 @@ edition = "2018" [dependencies] image = "0.23" -winit = "0.24" +winit = "0.25" # shaderc = "0.7" # REMOVED! cgmath = "0.18" env_logger = "0.8" log = "0.4" -wgpu = "0.8" +wgpu = "0.9" futures = "0.3" # NEW! diff --git a/code/beginner/tutorial4-buffer/Cargo.toml b/code/beginner/tutorial4-buffer/Cargo.toml index 833f9aab..03f3a412 100644 --- a/code/beginner/tutorial4-buffer/Cargo.toml +++ b/code/beginner/tutorial4-buffer/Cargo.toml @@ -8,8 +8,8 @@ edition = "2018" [dependencies] image = "0.23" cgmath = "0.18" -winit = "0.24" -wgpu = "0.8" +winit = "0.25" +wgpu = "0.9" env_logger = "0.8" log = "0.4" futures = "0.3" diff --git a/code/beginner/tutorial5-textures/Cargo.toml b/code/beginner/tutorial5-textures/Cargo.toml index de282e54..41cceaa8 100644 --- a/code/beginner/tutorial5-textures/Cargo.toml +++ b/code/beginner/tutorial5-textures/Cargo.toml @@ -14,8 +14,8 @@ env_logger = "0.8" log = "0.4" futures = "0.3" image = "0.23" -wgpu = "0.8" -winit = "0.24" +wgpu = "0.9" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/beginner/tutorial6-uniforms/Cargo.toml b/code/beginner/tutorial6-uniforms/Cargo.toml index 59b1042d..210388df 100644 --- a/code/beginner/tutorial6-uniforms/Cargo.toml +++ b/code/beginner/tutorial6-uniforms/Cargo.toml @@ -12,8 +12,8 @@ env_logger = "0.8" log = "0.4" futures = "0.3" image = "0.23" -wgpu = "0.8" -winit = "0.24" +wgpu = "0.9" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/beginner/tutorial7-instancing/Cargo.toml b/code/beginner/tutorial7-instancing/Cargo.toml index af96a45d..efac8356 100644 --- a/code/beginner/tutorial7-instancing/Cargo.toml +++ b/code/beginner/tutorial7-instancing/Cargo.toml @@ -12,8 +12,8 @@ env_logger = "0.8" log = "0.4" futures = "0.3" image = "0.23" -wgpu = "0.8" -winit = "0.24" +wgpu = "0.9" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/beginner/tutorial8-depth/Cargo.toml b/code/beginner/tutorial8-depth/Cargo.toml index 5d016115..b10127f1 100644 --- a/code/beginner/tutorial8-depth/Cargo.toml +++ b/code/beginner/tutorial8-depth/Cargo.toml @@ -12,8 +12,8 @@ env_logger = "0.8" futures = "0.3" image = "0.23" log = "0.4" -wgpu = "0.8" -winit = "0.24" +wgpu = "0.9" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/beginner/tutorial9-models/Cargo.toml b/code/beginner/tutorial9-models/Cargo.toml index 5cb0c88c..ff879cb8 100644 --- a/code/beginner/tutorial9-models/Cargo.toml +++ b/code/beginner/tutorial9-models/Cargo.toml @@ -14,7 +14,7 @@ image = "0.23" log = "0.4" tobj = "3.0" wgpu = {version = "0.8", features = [ "cross" ]} -winit = "0.24" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/intermediate/tutorial10-lighting/Cargo.toml b/code/intermediate/tutorial10-lighting/Cargo.toml index 544ea9a0..f61ac5c1 100644 --- a/code/intermediate/tutorial10-lighting/Cargo.toml +++ b/code/intermediate/tutorial10-lighting/Cargo.toml @@ -14,7 +14,7 @@ image = "0.23" log = "0.4" tobj = "3.0" wgpu = { version = "0.8", features = ["cross"]} -winit = "0.24" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/intermediate/tutorial11-normals/Cargo.toml b/code/intermediate/tutorial11-normals/Cargo.toml index b929e3d6..3b8d10c3 100644 --- a/code/intermediate/tutorial11-normals/Cargo.toml +++ b/code/intermediate/tutorial11-normals/Cargo.toml @@ -13,8 +13,8 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "3.0" -wgpu = "0.8" -winit = "0.24" +wgpu = "0.9" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/intermediate/tutorial12-camera/Cargo.toml b/code/intermediate/tutorial12-camera/Cargo.toml index ae0c666b..7430059f 100644 --- a/code/intermediate/tutorial12-camera/Cargo.toml +++ b/code/intermediate/tutorial12-camera/Cargo.toml @@ -13,8 +13,8 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "3.0" -wgpu = "0.8" -winit = "0.24" +wgpu = "0.9" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/intermediate/tutorial13-threading/Cargo.toml b/code/intermediate/tutorial13-threading/Cargo.toml index 5fd0fafb..f3aa6d29 100644 --- a/code/intermediate/tutorial13-threading/Cargo.toml +++ b/code/intermediate/tutorial13-threading/Cargo.toml @@ -14,8 +14,8 @@ image = "0.23" log = "0.4" rayon = "1.4" # NEW! tobj = "3.0" -wgpu = "0.8" -winit = "0.24" +wgpu = "0.9" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/showcase/compute/Cargo.toml b/code/showcase/compute/Cargo.toml index 22ad127b..256164bd 100644 --- a/code/showcase/compute/Cargo.toml +++ b/code/showcase/compute/Cargo.toml @@ -15,7 +15,7 @@ log = "0.4" rayon = "1.4" tobj = "2.0" wgpu = { version = "0.8", features = ["trace", "cross"] } -winit = "0.24" +winit = "0.25" [build-dependencies] anyhow = "1.0" diff --git a/code/showcase/framework/Cargo.toml b/code/showcase/framework/Cargo.toml index 829ffcf6..ead765c0 100644 --- a/code/showcase/framework/Cargo.toml +++ b/code/showcase/framework/Cargo.toml @@ -14,7 +14,7 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "2.0" -wgpu = "0.8" +wgpu = "0.9" wgpu-subscriber = "0.1" winit = "0.24" diff --git a/code/showcase/gifs/Cargo.toml b/code/showcase/gifs/Cargo.toml index 08fed6d2..68268ef2 100644 --- a/code/showcase/gifs/Cargo.toml +++ b/code/showcase/gifs/Cargo.toml @@ -14,8 +14,8 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "2.0" -wgpu = "0.8" -winit = "0.24" +wgpu = "0.9" +winit = "0.25" gif = "0.10.3" framework = { version = "0.1.0", path = "../framework" } diff --git a/code/showcase/imgui-demo/Cargo.toml b/code/showcase/imgui-demo/Cargo.toml index d925dded..389a2902 100644 --- a/code/showcase/imgui-demo/Cargo.toml +++ b/code/showcase/imgui-demo/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] anyhow = "1.0" -wgpu = "0.8" +wgpu = "0.9" futures = "0.3" imgui = "0.7" imgui-wgpu = "0.15" diff --git a/code/showcase/pong/Cargo.toml b/code/showcase/pong/Cargo.toml index 5ef28e0a..841bbc32 100644 --- a/code/showcase/pong/Cargo.toml +++ b/code/showcase/pong/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0" bytemuck = { version = "1.4", features = [ "derive" ] } cgmath = "0.18" futures = "0.3" -wgpu = "0.8" +wgpu = "0.9" wgpu_glyph = "0.12" rand = "0.8" rodio = "0.14" diff --git a/code/showcase/windowless/Cargo.toml b/code/showcase/windowless/Cargo.toml index 578c7a0e..61efb2ce 100644 --- a/code/showcase/windowless/Cargo.toml +++ b/code/showcase/windowless/Cargo.toml @@ -9,10 +9,10 @@ edition = "2018" [dependencies] image = "0.23" raw-window-handle = "0.3" -winit = "0.24" +winit = "0.25" shaderc = "0.7" cgmath = "0.18" -wgpu = "0.8" +wgpu = "0.9" futures = "0.3.4" [[bin]] diff --git a/docs/beginner/tutorial1-window/README.md b/docs/beginner/tutorial1-window/README.md index 90a354f6..2a19b4d6 100644 --- a/docs/beginner/tutorial1-window/README.md +++ b/docs/beginner/tutorial1-window/README.md @@ -9,11 +9,11 @@ For the beginner stuff, we're going to keep things very simple, we'll add things ```toml [dependencies] image = "0.23" -winit = "0.24" +winit = "0.25" cgmath = "0.18" env_logger = "0.8" log = "0.4" -wgpu = "0.8" +wgpu = "0.9" futures = "0.3" ``` diff --git a/docs/beginner/tutorial5-textures/README.md b/docs/beginner/tutorial5-textures/README.md index 4b336573..557c7889 100644 --- a/docs/beginner/tutorial5-textures/README.md +++ b/docs/beginner/tutorial5-textures/README.md @@ -425,7 +425,7 @@ For convenience sake, let's pull our texture code into its module. We'll first n [dependencies] image = "0.23" cgmath = "0.18" -winit = "0.24" +winit = "0.25" env_logger = "0.8" log = "0.4" futures = "0.3"