diff --git a/Cargo.lock b/Cargo.lock index 22b7b4a4..caf4438a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,6 +37,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + [[package]] name = "aho-corasick" version = "0.7.13" @@ -200,13 +206,28 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", "regex", "rustc-hash", "shlex", ] +[[package]] +name = "bit-set" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.2.1" @@ -240,9 +261,9 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dae23a39becf0b1c8f9198d7e9fc80aaf1ec1ee7428ec570f6a0269e59a9cc" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -277,6 +298,9 @@ name = "cc" version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +dependencies = [ + "jobserver", +] [[package]] name = "cexpr" @@ -299,6 +323,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "cgmath" version = "0.17.0" @@ -450,7 +480,7 @@ dependencies = [ "rayon", "shaderc", "tobj 2.0.2", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -744,10 +774,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", "strsim", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -758,7 +788,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -787,9 +817,9 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -854,12 +884,18 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", "synstructure", ] +[[package]] +name = "fixedbitset" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" + [[package]] name = "fnv" version = "1.0.7" @@ -898,7 +934,7 @@ dependencies = [ "shaderc", "thiserror", "tobj 2.0.2", - "wgpu 0.6.0", + "wgpu 0.7.0", "wgpu-subscriber", "winit 0.23.0", ] @@ -986,9 +1022,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -1067,7 +1103,7 @@ checksum = "67bdbf8e8d6883c70e5a0d7379ad8ab3ac95127a3761306b36122d8f1c177a8e" dependencies = [ "fxhash", "gfx-hal 0.5.3", - "spirv_cross", + "spirv_cross 0.20.0", ] [[package]] @@ -1078,7 +1114,18 @@ checksum = "6311ee3cc7a3b4c8ae94c4513cd2cbe888ec37990cf0ffa672bd275391b12eb1" dependencies = [ "fxhash", "gfx-hal 0.6.0", - "spirv_cross", + "spirv_cross 0.20.0", +] + +[[package]] +name = "gfx-auxil" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7b33ecf067f2117668d91c9b0f2e5f223ebd1ffec314caa2f3de27bb580186d" +dependencies = [ + "fxhash", + "gfx-hal 0.7.0", + "spirv_cross 0.23.0", ] [[package]] @@ -1096,7 +1143,7 @@ dependencies = [ "range-alloc", "raw-window-handle 0.3.3", "smallvec", - "spirv_cross", + "spirv_cross 0.20.0", "winapi 0.3.9", "wio", ] @@ -1116,7 +1163,29 @@ dependencies = [ "range-alloc", "raw-window-handle 0.3.3", "smallvec", - "spirv_cross", + "spirv_cross 0.20.0", + "winapi 0.3.9", + "wio", +] + +[[package]] +name = "gfx-backend-dx11" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f851d03c2e8f117e3702bf41201a4fafa447d5cb1276d5375870ae7573d069dd" +dependencies = [ + "arrayvec", + "bitflags", + "gfx-auxil 0.8.0", + "gfx-hal 0.7.0", + "libloading 0.6.2", + "log", + "parking_lot 0.11.0", + "range-alloc", + "raw-window-handle 0.3.3", + "smallvec", + "spirv_cross 0.23.0", + "thunderdome", "winapi 0.3.9", "wio", ] @@ -1135,7 +1204,7 @@ dependencies = [ "range-alloc", "raw-window-handle 0.3.3", "smallvec", - "spirv_cross", + "spirv_cross 0.20.0", "winapi 0.3.9", ] @@ -1153,7 +1222,28 @@ dependencies = [ "range-alloc", "raw-window-handle 0.3.3", "smallvec", - "spirv_cross", + "spirv_cross 0.20.0", + "winapi 0.3.9", +] + +[[package]] +name = "gfx-backend-dx12" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36dc6ba2b7647e2c2b27b8f74ff5ccdd53c703776588eee5b1de515fdcbd6bc9" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags", + "d3d12", + "gfx-auxil 0.8.0", + "gfx-hal 0.7.0", + "log", + "parking_lot 0.11.0", + "range-alloc", + "raw-window-handle 0.3.3", + "smallvec", + "spirv_cross 0.23.0", "winapi 0.3.9", ] @@ -1179,6 +1269,40 @@ dependencies = [ "raw-window-handle 0.3.3", ] +[[package]] +name = "gfx-backend-empty" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f07ef26a65954cfdd7b4c587f485100d1bb3b0bd6a51b02d817d6c87cca7a91" +dependencies = [ + "gfx-hal 0.7.0", + "log", + "raw-window-handle 0.3.3", +] + +[[package]] +name = "gfx-backend-gl" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17fd85420547bceb851fadb90f196f168abfc252d57528bd2d749db0d18b75f" +dependencies = [ + "arrayvec", + "bitflags", + "gfx-auxil 0.8.0", + "gfx-hal 0.7.0", + "glow", + "js-sys", + "khronos-egl", + "libloading 0.6.2", + "log", + "naga 0.3.1", + "parking_lot 0.11.0", + "raw-window-handle 0.3.3", + "spirv_cross 0.23.0", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gfx-backend-metal" version = "0.5.4" @@ -1202,7 +1326,7 @@ dependencies = [ "range-alloc", "raw-window-handle 0.3.3", "smallvec", - "spirv_cross", + "spirv_cross 0.20.0", "storage-map 0.2.0", ] @@ -1228,7 +1352,32 @@ dependencies = [ "range-alloc", "raw-window-handle 0.3.3", "smallvec", - "spirv_cross", + "spirv_cross 0.20.0", + "storage-map 0.3.0", +] + +[[package]] +name = "gfx-backend-metal" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dc54b456ece69ef49f8893269ebf24ac70969ed34ba2719c3f3abcc8fbff14e" +dependencies = [ + "arrayvec", + "bitflags", + "block", + "cocoa-foundation", + "copyless", + "foreign-types", + "gfx-auxil 0.8.0", + "gfx-hal 0.7.0", + "log", + "metal 0.21.0", + "naga 0.3.1", + "objc", + "parking_lot 0.11.0", + "range-alloc", + "raw-window-handle 0.3.3", + "spirv_cross 0.23.0", "storage-map 0.3.0", ] @@ -1273,6 +1422,27 @@ dependencies = [ "x11", ] +[[package]] +name = "gfx-backend-vulkan" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dabe88b1a5c91e0f969b441cc57e70364858066e4ba937deeb62065654ef9bd9" +dependencies = [ + "arrayvec", + "ash", + "byteorder", + "core-graphics-types", + "gfx-hal 0.7.0", + "inplace_it", + "log", + "naga 0.3.1", + "objc", + "parking_lot 0.11.0", + "raw-window-handle 0.3.3", + "smallvec", + "winapi 0.3.9", +] + [[package]] name = "gfx-descriptor" version = "0.1.0" @@ -1316,6 +1486,18 @@ dependencies = [ "raw-window-handle 0.3.3", ] +[[package]] +name = "gfx-hal" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1d9cc8d3b573dda62d0baca4f02e0209786e22c562caff001d77c389008781d" +dependencies = [ + "bitflags", + "naga 0.3.1", + "raw-window-handle 0.3.3", + "thiserror", +] + [[package]] name = "gfx-memory" version = "0.1.3" @@ -1369,7 +1551,7 @@ dependencies = [ "log", "shaderc", "tobj 2.0.2", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -1385,6 +1567,18 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +[[package]] +name = "glow" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "072136d2c3783f3a92f131acb227bc806d3886278e2a4dc1e9990ec89ef9e70b" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "glyph_brush" version = "0.7.0" @@ -1424,6 +1618,56 @@ dependencies = [ "xi-unicode", ] +[[package]] +name = "gpu-alloc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7724b9aef57ea36d70faf54e0ee6265f86e41de16bed8333efdeab5b00e16b" +dependencies = [ + "bitflags", + "gpu-alloc-types", + "tracing", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags", +] + +[[package]] +name = "gpu-descriptor" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d74668a6a6f0202e29f212a6d47ef8c7e092a76f4ab267b0065b6e0d175e45c6" +dependencies = [ + "bitflags", + "gpu-descriptor-types", + "hashbrown", + "tracing", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +dependencies = [ + "bitflags", +] + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.15" @@ -1520,7 +1764,7 @@ dependencies = [ "imgui", "imgui-wgpu", "imgui-winit-support", - "wgpu 0.6.0", + "wgpu 0.7.0", ] [[package]] @@ -1555,6 +1799,16 @@ dependencies = [ "winit 0.23.0", ] +[[package]] +name = "indexmap" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" +dependencies = [ + "autocfg 1.0.0", + "hashbrown", +] + [[package]] name = "inflate" version = "0.4.5" @@ -1566,9 +1820,9 @@ dependencies = [ [[package]] name = "inplace_it" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd01a2a73f2f399df96b22dc88ea687ef4d76226284e7531ae3c7ee1dc5cb534" +checksum = "90953f308a79fe6d62a4643e51f848fbfddcd05975a38e69fdf4ab86a7baf7ca" [[package]] name = "instancing" @@ -1585,7 +1839,7 @@ dependencies = [ "log", "shaderc", "tobj 2.0.2", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -1616,6 +1870,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +[[package]] +name = "jobserver" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" +dependencies = [ + "libc", +] + [[package]] name = "jpeg-decoder" version = "0.1.20" @@ -1628,9 +1891,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.42" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2" +checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" dependencies = [ "wasm-bindgen", ] @@ -1645,6 +1908,16 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "khronos-egl" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8020ff3b84f9ac87461216ad0501bc09b33c1cbe17404d8ea405160fd164bab" +dependencies = [ + "libc", + "libloading 0.6.2", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -1841,6 +2114,20 @@ dependencies = [ "objc", ] +[[package]] +name = "metal" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4598d719460ade24c7d91f335daf055bf2a7eec030728ce751814c50cdd6a26c" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "foreign-types", + "log", + "objc", +] + [[package]] name = "minimp3" version = "0.3.5" @@ -1935,6 +2222,23 @@ dependencies = [ "thiserror", ] +[[package]] +name = "naga" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8f30d7036f137a2f64fd7d53b70a91545d3f09e030b77b3816ff7bd4cf3f789" +dependencies = [ + "bit-set", + "bitflags", + "fxhash", + "log", + "num-traits", + "petgraph", + "serde", + "spirv_headers", + "thiserror", +] + [[package]] name = "ndk" version = "0.1.0" @@ -1994,9 +2298,9 @@ checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" dependencies = [ "darling", "proc-macro-crate", - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -2147,9 +2451,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -2284,9 +2588,9 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb44a25c5bba983be0fc8592dfaf3e6d0935ce8be0c6b15b2a39507af34a926" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", "synstructure", "unicode-xid 0.2.1", ] @@ -2322,6 +2626,16 @@ dependencies = [ "winit 0.22.2", ] +[[package]] +name = "petgraph" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" +dependencies = [ + "fixedbitset", + "indexmap", +] + [[package]] name = "pin-project" version = "0.4.22" @@ -2337,9 +2651,9 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -2391,7 +2705,7 @@ dependencies = [ "rand 0.7.3", "rodio", "shaderc", - "wgpu 0.6.0", + "wgpu 0.7.0", "wgpu_glyph", "winit 0.22.2", ] @@ -2434,9 +2748,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.19" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid 0.2.1", ] @@ -2462,7 +2776,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", ] [[package]] @@ -2843,9 +3157,9 @@ version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -2912,6 +3226,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "slotmap" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c46a3482db8f247956e464d783693ece164ca056e6e67563ee5505bdb86452cd" + [[package]] name = "smallvec" version = "1.4.1" @@ -2965,11 +3285,22 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "spirv_cross" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06db6bd7b6518f761593783e2896eefe55e90455efc5f44511078ce0426ed418" +dependencies = [ + "cc", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "spirv_headers" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1418983d16481227ffa3ab3cf44ef92eebc9a76c092fbcd4c51a64ff032622" +checksum = "1f5b132530b1ac069df335577e3581765995cba5a13995cdbbdbc8fb057c532c" dependencies = [ "bitflags", "num-traits", @@ -3027,11 +3358,11 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.35" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" +checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", "unicode-xid 0.2.1", ] @@ -3042,9 +3373,9 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", "unicode-xid 0.2.1", ] @@ -3059,22 +3390,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -3097,6 +3428,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "thunderdome" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7572415bd688d401c52f6e36f4c8e805b9ae1622619303b9fa835d531db0acae" + [[package]] name = "tiff" version = "0.3.1" @@ -3175,9 +3512,9 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", ] [[package]] @@ -3254,7 +3591,7 @@ dependencies = [ "image 0.23.7", "log", "shaderc", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3273,7 +3610,7 @@ dependencies = [ "log", "shaderc", "tobj 2.0.2", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3292,7 +3629,7 @@ dependencies = [ "log", "shaderc", "tobj 2.0.2", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3311,7 +3648,7 @@ dependencies = [ "log", "shaderc", "tobj 2.0.2", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.23.0", ] @@ -3331,7 +3668,7 @@ dependencies = [ "rayon", "shaderc", "tobj 2.0.2", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.23.0", ] @@ -3345,7 +3682,7 @@ dependencies = [ "image 0.23.7", "log", "shaderc", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3362,7 +3699,7 @@ dependencies = [ "image 0.23.7", "log", "shaderc", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3380,7 +3717,7 @@ dependencies = [ "image 0.23.7", "log", "shaderc", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3398,7 +3735,7 @@ dependencies = [ "image 0.23.7", "log", "shaderc", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3416,7 +3753,7 @@ dependencies = [ "image 0.23.7", "log", "shaderc", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3434,7 +3771,7 @@ dependencies = [ "image 0.23.7", "log", "shaderc", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3452,7 +3789,7 @@ dependencies = [ "image 0.23.7", "log", "shaderc", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3471,7 +3808,7 @@ dependencies = [ "log", "shaderc", "tobj 2.0.2", - "wgpu 0.6.0", + "wgpu 0.7.0", "winit 0.22.2", ] @@ -3545,36 +3882,36 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.65" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d" +checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.65" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d" +checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.15" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ad6e4e8b2b7f8c90b6e09a9b590ea15cb0d1dbe28502b5a405cd95d1981671" +checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", @@ -3582,9 +3919,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.65" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e" +checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" dependencies = [ "quote 1.0.7", "wasm-bindgen-macro-support", @@ -3592,22 +3929,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.65" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6" +checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.65" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87" +checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" [[package]] name = "wayland-client" @@ -3716,7 +4053,7 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ee5bd43a1d746efc486515fec561e47205f328b74802b959f10f5500f7e56cc" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.24", "quote 1.0.7", "xml-rs", ] @@ -3744,9 +4081,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.42" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2" +checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" dependencies = [ "js-sys", "wasm-bindgen", @@ -3780,7 +4117,6 @@ dependencies = [ "objc", "parking_lot 0.11.0", "raw-window-handle 0.3.3", - "serde", "smallvec", "tracing", "typed-arena", @@ -3791,6 +4127,27 @@ dependencies = [ "wgpu-types 0.6.0", ] +[[package]] +name = "wgpu" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c60007fc3748278a36b458d96f86105f43aa5f0e412b15a5f934950d61ec26a9" +dependencies = [ + "arrayvec", + "js-sys", + "naga 0.3.1", + "parking_lot 0.11.0", + "raw-window-handle 0.3.3", + "serde", + "smallvec", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.7.0", + "wgpu-types 0.7.0", +] + [[package]] name = "wgpu-core" version = "0.5.6" @@ -3835,7 +4192,36 @@ dependencies = [ "gfx-descriptor 0.2.0", "gfx-hal 0.6.0", "gfx-memory 0.2.0", - "naga", + "naga 0.2.0", + "parking_lot 0.11.0", + "raw-window-handle 0.3.3", + "smallvec", + "thiserror", + "tracing", + "wgpu-types 0.6.0", +] + +[[package]] +name = "wgpu-core" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d0b0acbc906c464cb75dac28062a8591ec9fe0ce61e271bb732c43196dc6aa1" +dependencies = [ + "arrayvec", + "bitflags", + "cfg_aliases", + "copyless", + "fxhash", + "gfx-backend-dx11 0.7.0", + "gfx-backend-dx12 0.7.0", + "gfx-backend-empty 0.7.0", + "gfx-backend-gl", + "gfx-backend-metal 0.7.0", + "gfx-backend-vulkan 0.7.0", + "gfx-hal 0.7.0", + "gpu-alloc", + "gpu-descriptor", + "naga 0.3.1", "parking_lot 0.11.0", "raw-window-handle 0.3.3", "ron", @@ -3843,7 +4229,7 @@ dependencies = [ "smallvec", "thiserror", "tracing", - "wgpu-types 0.6.0", + "wgpu-types 0.7.0", ] [[package]] @@ -3890,6 +4276,15 @@ name = "wgpu-types" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb82203cfaa5165e6eb9f1daca5b0ba8a2b8d632f6c9a7f9b10463b145deb2b" +dependencies = [ + "bitflags", +] + +[[package]] +name = "wgpu-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72fa9ba80626278fd87351555c363378d08122d7601e58319be3d6fa85a87747" dependencies = [ "bitflags", "serde", @@ -4138,7 +4533,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d498dbd1fd7beb83c86709ae1c33ca50942889473473d287d56ce4770a18edfb" dependencies = [ - "proc-macro2 1.0.19", - "syn 1.0.35", + "proc-macro2 1.0.24", + "syn 1.0.60", "synstructure", ] diff --git a/code/beginner/tutorial1-window/Cargo.toml b/code/beginner/tutorial1-window/Cargo.toml index 7ef153c0..e4efe34c 100644 --- a/code/beginner/tutorial1-window/Cargo.toml +++ b/code/beginner/tutorial1-window/Cargo.toml @@ -18,5 +18,5 @@ shaderc = "0.7" cgmath = "0.17" env_logger = "0.7" log = "0.4" -wgpu = "0.6" +wgpu = "0.7" futures = "0.3" diff --git a/code/beginner/tutorial2-swapchain/Cargo.toml b/code/beginner/tutorial2-swapchain/Cargo.toml index 2b55fb64..c23ff9f8 100644 --- a/code/beginner/tutorial2-swapchain/Cargo.toml +++ b/code/beginner/tutorial2-swapchain/Cargo.toml @@ -13,7 +13,7 @@ shaderc = "0.7" cgmath = "0.17" env_logger = "0.7" log = "0.4" -wgpu = "0.6" +wgpu = "0.7" futures = "0.3" diff --git a/code/beginner/tutorial2-swapchain/src/challenge.rs b/code/beginner/tutorial2-swapchain/src/challenge.rs index ca26e4e0..d9905863 100644 --- a/code/beginner/tutorial2-swapchain/src/challenge.rs +++ b/code/beginner/tutorial2-swapchain/src/challenge.rs @@ -26,7 +26,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -35,9 +35,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -45,7 +45,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -103,6 +103,7 @@ impl State { { let _render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial2-swapchain/src/main.rs b/code/beginner/tutorial2-swapchain/src/main.rs index 6a59a002..4eeaef5e 100644 --- a/code/beginner/tutorial2-swapchain/src/main.rs +++ b/code/beginner/tutorial2-swapchain/src/main.rs @@ -25,7 +25,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -34,9 +34,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -44,7 +44,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -87,6 +87,7 @@ impl State { { let _render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial3-pipeline/Cargo.toml b/code/beginner/tutorial3-pipeline/Cargo.toml index a3d9a2d2..a557afee 100644 --- a/code/beginner/tutorial3-pipeline/Cargo.toml +++ b/code/beginner/tutorial3-pipeline/Cargo.toml @@ -11,7 +11,7 @@ winit = "0.22" cgmath = "0.17" env_logger = "0.7" log = "0.4" -wgpu = "0.6" +wgpu = "0.7" futures = "0.3" # NEW! diff --git a/code/beginner/tutorial3-pipeline/src/challenge.rs b/code/beginner/tutorial3-pipeline/src/challenge.rs index a38063ce..849b1268 100644 --- a/code/beginner/tutorial3-pipeline/src/challenge.rs +++ b/code/beginner/tutorial3-pipeline/src/challenge.rs @@ -28,7 +28,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -37,9 +37,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -47,7 +47,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -98,7 +98,6 @@ impl State { }, sample_count: 1, sample_mask: !0, - alpha_to_coverage_enabled: false, }); let vs_module = device.create_shader_module(wgpu::include_spirv!("challenge.vert.spv")); @@ -194,6 +193,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial3-pipeline/src/main.rs b/code/beginner/tutorial3-pipeline/src/main.rs index 6998c7e6..daf30e03 100644 --- a/code/beginner/tutorial3-pipeline/src/main.rs +++ b/code/beginner/tutorial3-pipeline/src/main.rs @@ -27,7 +27,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -36,9 +36,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -46,7 +46,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -136,6 +136,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial4-buffer/Cargo.toml b/code/beginner/tutorial4-buffer/Cargo.toml index 9b28b1ff..50004410 100644 --- a/code/beginner/tutorial4-buffer/Cargo.toml +++ b/code/beginner/tutorial4-buffer/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" image = "0.23" winit = "0.22" cgmath = "0.17" -wgpu = "0.6" +wgpu = "0.7" env_logger = "0.7" log = "0.4" futures = "0.3" diff --git a/code/beginner/tutorial4-buffer/src/challenge.rs b/code/beginner/tutorial4-buffer/src/challenge.rs index cae17aa7..a4bce19d 100644 --- a/code/beginner/tutorial4-buffer/src/challenge.rs +++ b/code/beginner/tutorial4-buffer/src/challenge.rs @@ -91,7 +91,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -100,9 +100,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -110,7 +110,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -265,6 +265,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial4-buffer/src/main.rs b/code/beginner/tutorial4-buffer/src/main.rs index ff8e0ae9..ab7f34f4 100644 --- a/code/beginner/tutorial4-buffer/src/main.rs +++ b/code/beginner/tutorial4-buffer/src/main.rs @@ -84,7 +84,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -93,9 +93,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -103,7 +103,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -208,6 +208,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial5-textures/Cargo.toml b/code/beginner/tutorial5-textures/Cargo.toml index 543a8ea7..d54cc494 100644 --- a/code/beginner/tutorial5-textures/Cargo.toml +++ b/code/beginner/tutorial5-textures/Cargo.toml @@ -14,7 +14,7 @@ env_logger = "0.7" log = "0.4" futures = "0.3" image = "0.23" -wgpu = "0.6" +wgpu = "0.7" winit = "0.22" [build-dependencies] diff --git a/code/beginner/tutorial5-textures/src/challenge.rs b/code/beginner/tutorial5-textures/src/challenge.rs index 52f3b806..339fd44d 100644 --- a/code/beginner/tutorial5-textures/src/challenge.rs +++ b/code/beginner/tutorial5-textures/src/challenge.rs @@ -93,7 +93,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -101,9 +101,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -111,7 +111,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -296,6 +296,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial5-textures/src/main.rs b/code/beginner/tutorial5-textures/src/main.rs index 83eef00b..354b84c9 100644 --- a/code/beginner/tutorial5-textures/src/main.rs +++ b/code/beginner/tutorial5-textures/src/main.rs @@ -90,7 +90,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -98,9 +98,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -108,7 +108,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -257,6 +257,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial6-uniforms/Cargo.toml b/code/beginner/tutorial6-uniforms/Cargo.toml index c7e3ffd0..1fb43386 100644 --- a/code/beginner/tutorial6-uniforms/Cargo.toml +++ b/code/beginner/tutorial6-uniforms/Cargo.toml @@ -12,7 +12,7 @@ env_logger = "0.7" log = "0.4" futures = "0.3" image = "0.23" -wgpu = "0.6" +wgpu = "0.7" winit = "0.22" [build-dependencies] diff --git a/code/beginner/tutorial6-uniforms/src/challenge.rs b/code/beginner/tutorial6-uniforms/src/challenge.rs index a3e3fdd6..7a7b47bb 100644 --- a/code/beginner/tutorial6-uniforms/src/challenge.rs +++ b/code/beginner/tutorial6-uniforms/src/challenge.rs @@ -255,7 +255,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -263,9 +263,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -273,7 +273,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -482,6 +482,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial6-uniforms/src/main.rs b/code/beginner/tutorial6-uniforms/src/main.rs index fec489c8..f6d9662d 100644 --- a/code/beginner/tutorial6-uniforms/src/main.rs +++ b/code/beginner/tutorial6-uniforms/src/main.rs @@ -240,7 +240,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -248,9 +248,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -258,7 +258,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -464,6 +464,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial7-instancing/Cargo.toml b/code/beginner/tutorial7-instancing/Cargo.toml index e1e1d392..7e7705b5 100644 --- a/code/beginner/tutorial7-instancing/Cargo.toml +++ b/code/beginner/tutorial7-instancing/Cargo.toml @@ -12,7 +12,7 @@ env_logger = "0.7" log = "0.4" futures = "0.3" image = "0.23" -wgpu = "0.6" +wgpu = "0.7" winit = "0.22" [build-dependencies] diff --git a/code/beginner/tutorial7-instancing/src/challenge.rs b/code/beginner/tutorial7-instancing/src/challenge.rs index fa92c69a..1f2ba996 100644 --- a/code/beginner/tutorial7-instancing/src/challenge.rs +++ b/code/beginner/tutorial7-instancing/src/challenge.rs @@ -337,7 +337,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -345,9 +345,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -355,7 +355,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -614,6 +614,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial7-instancing/src/main.rs b/code/beginner/tutorial7-instancing/src/main.rs index 857cc8a5..fb93c60b 100644 --- a/code/beginner/tutorial7-instancing/src/main.rs +++ b/code/beginner/tutorial7-instancing/src/main.rs @@ -301,7 +301,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -309,9 +309,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -319,7 +319,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, @@ -564,6 +564,7 @@ impl State { { let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Render Pass"), color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor { attachment: &frame.view, resolve_target: None, diff --git a/code/beginner/tutorial8-depth/Cargo.toml b/code/beginner/tutorial8-depth/Cargo.toml index 279ea747..b3ee1370 100644 --- a/code/beginner/tutorial8-depth/Cargo.toml +++ b/code/beginner/tutorial8-depth/Cargo.toml @@ -12,7 +12,7 @@ env_logger = "0.7" futures = "0.3" image = "0.23" log = "0.4" -wgpu = "0.6" +wgpu = "0.7" winit = "0.22" [build-dependencies] diff --git a/code/beginner/tutorial8-depth/src/challenge.rs b/code/beginner/tutorial8-depth/src/challenge.rs index a8971a34..4e2de724 100644 --- a/code/beginner/tutorial8-depth/src/challenge.rs +++ b/code/beginner/tutorial8-depth/src/challenge.rs @@ -488,7 +488,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -496,9 +496,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -506,7 +506,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/beginner/tutorial8-depth/src/main.rs b/code/beginner/tutorial8-depth/src/main.rs index 2395003c..8e2cf750 100644 --- a/code/beginner/tutorial8-depth/src/main.rs +++ b/code/beginner/tutorial8-depth/src/main.rs @@ -311,7 +311,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -319,9 +319,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -329,7 +329,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/beginner/tutorial8-depth/src/texture.rs b/code/beginner/tutorial8-depth/src/texture.rs index 95b623cb..4215c303 100644 --- a/code/beginner/tutorial8-depth/src/texture.rs +++ b/code/beginner/tutorial8-depth/src/texture.rs @@ -27,7 +27,7 @@ impl Texture { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED, }; let texture = device.create_texture(&desc); let view = texture.create_view(&wgpu::TextureViewDescriptor::default()); diff --git a/code/beginner/tutorial9-models/Cargo.toml b/code/beginner/tutorial9-models/Cargo.toml index 9296970c..5a98d642 100644 --- a/code/beginner/tutorial9-models/Cargo.toml +++ b/code/beginner/tutorial9-models/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "2.0" -wgpu = "0.6" +wgpu = "0.7" winit = "0.22" [build-dependencies] diff --git a/code/beginner/tutorial9-models/src/main.rs b/code/beginner/tutorial9-models/src/main.rs index d01bf6f2..f348d8f2 100644 --- a/code/beginner/tutorial9-models/src/main.rs +++ b/code/beginner/tutorial9-models/src/main.rs @@ -249,7 +249,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -257,9 +257,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -267,7 +267,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/beginner/tutorial9-models/src/texture.rs b/code/beginner/tutorial9-models/src/texture.rs index f6d5c4ae..9f023206 100644 --- a/code/beginner/tutorial9-models/src/texture.rs +++ b/code/beginner/tutorial9-models/src/texture.rs @@ -41,7 +41,7 @@ impl Texture { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED, }; let texture = device.create_texture(&desc); let view = texture.create_view(&wgpu::TextureViewDescriptor::default()); diff --git a/code/intermediate/tutorial10-lighting/Cargo.toml b/code/intermediate/tutorial10-lighting/Cargo.toml index 94b8099a..d6aa8f86 100644 --- a/code/intermediate/tutorial10-lighting/Cargo.toml +++ b/code/intermediate/tutorial10-lighting/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "2.0" -wgpu = "0.6" +wgpu = "0.7" winit = "0.22" [build-dependencies] diff --git a/code/intermediate/tutorial10-lighting/src/main.rs b/code/intermediate/tutorial10-lighting/src/main.rs index ed5dc213..5f670b34 100644 --- a/code/intermediate/tutorial10-lighting/src/main.rs +++ b/code/intermediate/tutorial10-lighting/src/main.rs @@ -324,7 +324,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -332,9 +332,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -342,7 +342,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/intermediate/tutorial10-lighting/src/texture.rs b/code/intermediate/tutorial10-lighting/src/texture.rs index f6d5c4ae..9f023206 100644 --- a/code/intermediate/tutorial10-lighting/src/texture.rs +++ b/code/intermediate/tutorial10-lighting/src/texture.rs @@ -41,7 +41,7 @@ impl Texture { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED, }; let texture = device.create_texture(&desc); let view = texture.create_view(&wgpu::TextureViewDescriptor::default()); diff --git a/code/intermediate/tutorial11-normals/Cargo.toml b/code/intermediate/tutorial11-normals/Cargo.toml index 95f15f1b..91622449 100644 --- a/code/intermediate/tutorial11-normals/Cargo.toml +++ b/code/intermediate/tutorial11-normals/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "2.0" -wgpu = "0.6" +wgpu = "0.7" winit = "0.22" [build-dependencies] diff --git a/code/intermediate/tutorial11-normals/src/main.rs b/code/intermediate/tutorial11-normals/src/main.rs index c94f2bff..491f5f9b 100644 --- a/code/intermediate/tutorial11-normals/src/main.rs +++ b/code/intermediate/tutorial11-normals/src/main.rs @@ -321,7 +321,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -329,9 +329,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -339,7 +339,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/intermediate/tutorial11-normals/src/texture.rs b/code/intermediate/tutorial11-normals/src/texture.rs index b3707e6f..c39f3f38 100644 --- a/code/intermediate/tutorial11-normals/src/texture.rs +++ b/code/intermediate/tutorial11-normals/src/texture.rs @@ -42,7 +42,7 @@ impl Texture { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED, }; let texture = device.create_texture(&desc); let view = texture.create_view(&wgpu::TextureViewDescriptor::default()); diff --git a/code/intermediate/tutorial12-camera/Cargo.toml b/code/intermediate/tutorial12-camera/Cargo.toml index 8c4e3f9f..03d03939 100644 --- a/code/intermediate/tutorial12-camera/Cargo.toml +++ b/code/intermediate/tutorial12-camera/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "2.0" -wgpu = "0.6" +wgpu = "0.7" winit = "0.23" [build-dependencies] diff --git a/code/intermediate/tutorial12-camera/src/main.rs b/code/intermediate/tutorial12-camera/src/main.rs index f6db66a9..d982713f 100644 --- a/code/intermediate/tutorial12-camera/src/main.rs +++ b/code/intermediate/tutorial12-camera/src/main.rs @@ -202,7 +202,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -210,9 +210,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -220,7 +220,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/intermediate/tutorial12-camera/src/texture.rs b/code/intermediate/tutorial12-camera/src/texture.rs index b3707e6f..c39f3f38 100644 --- a/code/intermediate/tutorial12-camera/src/texture.rs +++ b/code/intermediate/tutorial12-camera/src/texture.rs @@ -42,7 +42,7 @@ impl Texture { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED, }; let texture = device.create_texture(&desc); let view = texture.create_view(&wgpu::TextureViewDescriptor::default()); diff --git a/code/intermediate/tutorial13-threading/Cargo.toml b/code/intermediate/tutorial13-threading/Cargo.toml index fd768b16..46745b94 100644 --- a/code/intermediate/tutorial13-threading/Cargo.toml +++ b/code/intermediate/tutorial13-threading/Cargo.toml @@ -14,7 +14,7 @@ image = "0.23" log = "0.4" rayon = "1.4" # NEW! tobj = "2.0" -wgpu = "0.6" +wgpu = "0.7" winit = "0.23" [build-dependencies] diff --git a/code/intermediate/tutorial13-threading/src/main.rs b/code/intermediate/tutorial13-threading/src/main.rs index 958ea884..d482f8a7 100644 --- a/code/intermediate/tutorial13-threading/src/main.rs +++ b/code/intermediate/tutorial13-threading/src/main.rs @@ -202,7 +202,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -210,9 +210,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -220,7 +220,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/intermediate/tutorial13-threading/src/texture.rs b/code/intermediate/tutorial13-threading/src/texture.rs index b3707e6f..c39f3f38 100644 --- a/code/intermediate/tutorial13-threading/src/texture.rs +++ b/code/intermediate/tutorial13-threading/src/texture.rs @@ -42,7 +42,7 @@ impl Texture { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED, }; let texture = device.create_texture(&desc); let view = texture.create_view(&wgpu::TextureViewDescriptor::default()); diff --git a/code/research/performance/src/main.rs b/code/research/performance/src/main.rs index d81a4c60..1754a272 100644 --- a/code/research/performance/src/main.rs +++ b/code/research/performance/src/main.rs @@ -227,7 +227,7 @@ impl State { let adapter = wgpu::Adapter::request( &wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }, wgpu::BackendBit::PRIMARY, // Vulkan + Metal + DX12 + Browser WebGPU @@ -245,7 +245,7 @@ impl State { .await; let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/research/performance/src/texture.rs b/code/research/performance/src/texture.rs index e454694b..2e8932c4 100644 --- a/code/research/performance/src/texture.rs +++ b/code/research/performance/src/texture.rs @@ -46,7 +46,7 @@ impl Texture { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_SRC, }; @@ -123,7 +123,7 @@ impl Texture { usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST // Needed for to make the mip maps. - | wgpu::TextureUsage::OUTPUT_ATTACHMENT, + | wgpu::TextureUsage::RENDER_ATTACHMENT, }; let texture = device.create_texture(&texture_desc); diff --git a/code/showcase/compute/Cargo.toml b/code/showcase/compute/Cargo.toml index 32b7afbc..3f8ea1c2 100644 --- a/code/showcase/compute/Cargo.toml +++ b/code/showcase/compute/Cargo.toml @@ -14,7 +14,7 @@ image = "0.23" log = "0.4" rayon = "1.4" tobj = "2.0" -wgpu = { version = "0.6", features = ["trace"] } +wgpu = { version = "0.7", features = ["trace"] } winit = "0.22" [build-dependencies] diff --git a/code/showcase/compute/src/main.rs b/code/showcase/compute/src/main.rs index 8545eae9..2104ef5b 100644 --- a/code/showcase/compute/src/main.rs +++ b/code/showcase/compute/src/main.rs @@ -150,7 +150,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -159,9 +159,9 @@ impl State { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, Some(&path), // Trace path ) @@ -169,7 +169,7 @@ impl State { .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/showcase/compute/src/texture.rs b/code/showcase/compute/src/texture.rs index b3707e6f..c39f3f38 100644 --- a/code/showcase/compute/src/texture.rs +++ b/code/showcase/compute/src/texture.rs @@ -42,7 +42,7 @@ impl Texture { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED, }; let texture = device.create_texture(&desc); let view = texture.create_view(&wgpu::TextureViewDescriptor::default()); diff --git a/code/showcase/framework/Cargo.toml b/code/showcase/framework/Cargo.toml index d656a4cb..89631ec0 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.6" +wgpu = "0.7" wgpu-subscriber = "0.1" winit = "0.23" diff --git a/code/showcase/framework/src/lib.rs b/code/showcase/framework/src/lib.rs index eda89c1f..9972091a 100644 --- a/code/showcase/framework/src/lib.rs +++ b/code/showcase/framework/src/lib.rs @@ -39,7 +39,7 @@ impl Display { let surface = unsafe { instance.create_surface(&window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -47,16 +47,16 @@ impl Display { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, ) .await .unwrap(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/showcase/framework/src/texture.rs b/code/showcase/framework/src/texture.rs index eb49cbcd..73dc61a6 100644 --- a/code/showcase/framework/src/texture.rs +++ b/code/showcase/framework/src/texture.rs @@ -145,7 +145,7 @@ impl<'a> Texture<'a> { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, }; Self::from_descriptor(device, desc) } diff --git a/code/showcase/gifs/Cargo.toml b/code/showcase/gifs/Cargo.toml index febf7257..ea3474d5 100644 --- a/code/showcase/gifs/Cargo.toml +++ b/code/showcase/gifs/Cargo.toml @@ -14,7 +14,7 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "2.0" -wgpu = "0.6" +wgpu = "0.7" winit = "0.22" gif = "0.10.3" diff --git a/code/showcase/gifs/src/main.rs b/code/showcase/gifs/src/main.rs index cf0ef4f3..549b2a81 100644 --- a/code/showcase/gifs/src/main.rs +++ b/code/showcase/gifs/src/main.rs @@ -44,7 +44,7 @@ async fn run() { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: wgpu::TextureFormat::Rgba8UnormSrgb, - usage: wgpu::TextureUsage::COPY_SRC | wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::COPY_SRC | wgpu::TextureUsage::RENDER_ATTACHMENT, label: None, }; let render_target = framework::Texture::from_descriptor(&device, rt_desc); diff --git a/code/showcase/imgui-demo/Cargo.toml b/code/showcase/imgui-demo/Cargo.toml index e28bd659..4faf9d36 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.6" +wgpu = "0.7" futures = "0.3" imgui = "0.6" imgui-wgpu = "0.12" diff --git a/code/showcase/instancing/Cargo.toml b/code/showcase/instancing/Cargo.toml index 991b19bc..c052d739 100644 --- a/code/showcase/instancing/Cargo.toml +++ b/code/showcase/instancing/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.3" image = "0.23" log = "0.4" tobj = "2.0" -wgpu = "0.6" +wgpu = "0.7" winit = "0.22" [build-dependencies] diff --git a/code/showcase/pong/Cargo.toml b/code/showcase/pong/Cargo.toml index 7a38293e..28b07d17 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.17" futures = "0.3" -wgpu = "0.6" +wgpu = "0.7" wgpu_glyph = "0.10" rand = "0.7" rodio = "0.11" diff --git a/code/showcase/pong/src/render/mod.rs b/code/showcase/pong/src/render/mod.rs index 45ee9248..cc7cefc7 100644 --- a/code/showcase/pong/src/render/mod.rs +++ b/code/showcase/pong/src/render/mod.rs @@ -45,7 +45,7 @@ impl Render { let surface = unsafe { instance.create_surface(window) }; let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }) .await @@ -53,9 +53,9 @@ impl Render { let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { + label: None, features: wgpu::Features::empty(), limits: wgpu::Limits::default(), - shader_validation: true, }, None, // Trace path ) @@ -64,7 +64,7 @@ impl Render { let size = video_mode.size(); let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/code/showcase/windowless/src/main.rs b/code/showcase/windowless/src/main.rs index fc04833d..f4ae3ad2 100644 --- a/code/showcase/windowless/src/main.rs +++ b/code/showcase/windowless/src/main.rs @@ -1,7 +1,7 @@ async fn run() { let adapter = wgpu::Adapter::request( &wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: None, }, wgpu::BackendBit::PRIMARY, @@ -22,7 +22,7 @@ async fn run() { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: wgpu::TextureFormat::Rgba8UnormSrgb, - usage: wgpu::TextureUsage::COPY_SRC | wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::COPY_SRC | wgpu::TextureUsage::RENDER_ATTACHMENT, label: None, }; let texture = device.create_texture(&texture_desc); diff --git a/docs/beginner/tutorial1-window/README.md b/docs/beginner/tutorial1-window/README.md index 9e093283..0a6935e8 100644 --- a/docs/beginner/tutorial1-window/README.md +++ b/docs/beginner/tutorial1-window/README.md @@ -14,7 +14,7 @@ shaderc = "0.7" cgmath = "0.17" env_logger = "0.7" log = "0.4" -wgpu = "0.6" +wgpu = "0.7" futures = "0.3" ``` diff --git a/docs/beginner/tutorial2-swapchain/README.md b/docs/beginner/tutorial2-swapchain/README.md index eb986e95..bb238a96 100644 --- a/docs/beginner/tutorial2-swapchain/README.md +++ b/docs/beginner/tutorial2-swapchain/README.md @@ -55,7 +55,7 @@ impl State { let surface = unsafe { instance.create_surface(window) }; let adapter = instance.request_adapter( &wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: Some(&surface), }, ).await.unwrap(); @@ -92,7 +92,7 @@ The `limits` field describes the limit of certain types of resource we can creat ```rust let sc_desc = wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, + usage: wgpu::TextureUsage::RENDER_ATTACHMENT, format: wgpu::TextureFormat::Bgra8UnormSrgb, width: size.width, height: size.height, diff --git a/docs/beginner/tutorial3-pipeline/README.md b/docs/beginner/tutorial3-pipeline/README.md index fa1b3fa0..a05cef02 100644 --- a/docs/beginner/tutorial3-pipeline/README.md +++ b/docs/beginner/tutorial3-pipeline/README.md @@ -279,7 +279,7 @@ image = "0.23" winit = "0.22" # shaderc = "0.7" # REMOVED! cgmath = "0.17" -wgpu = "0.6" +wgpu = "0.7" futures = "0.3" # NEW! diff --git a/docs/beginner/tutorial8-depth/README.md b/docs/beginner/tutorial8-depth/README.md index 57845cf2..bd49a43e 100644 --- a/docs/beginner/tutorial8-depth/README.md +++ b/docs/beginner/tutorial8-depth/README.md @@ -39,7 +39,7 @@ impl Texture { sample_count: 1, dimension: wgpu::TextureDimension::D2, format: Self::DEPTH_FORMAT, - usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT // 3. + usage: wgpu::TextureUsage::RENDER_ATTACHMENT // 3. | wgpu::TextureUsage::SAMPLED, }; let texture = device.create_texture(&desc); diff --git a/docs/showcase/gifs/README.md b/docs/showcase/gifs/README.md index 37929464..5002fcb9 100644 --- a/docs/showcase/gifs/README.md +++ b/docs/showcase/gifs/README.md @@ -61,7 +61,7 @@ let rt_desc = wgpu::TextureDescriptor { dimension: wgpu::TextureDimension::D2, format: wgpu::TextureFormat::Rgba8UnormSrgb, usage: wgpu::TextureUsage::COPY_SRC - | wgpu::TextureUsage::OUTPUT_ATTACHMENT, + | wgpu::TextureUsage::RENDER_ATTACHMENT, label: None, }; let render_target = framework::Texture::from_descriptor(&device, rt_desc); diff --git a/docs/showcase/windowless/README.md b/docs/showcase/windowless/README.md index d8b4afe7..4098e563 100644 --- a/docs/showcase/windowless/README.md +++ b/docs/showcase/windowless/README.md @@ -9,7 +9,7 @@ It's actually quite simple. We don't *need* a window to create an `Instance`, we ```rust let adapter = wgpu::Adapter::request( &wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::Default, + power_preference: wgpu::PowerPreference::default(), compatible_surface: None, }, wgpu::BackendBit::PRIMARY, @@ -36,7 +36,7 @@ let texture_desc = wgpu::TextureDescriptor { dimension: wgpu::TextureDimension::D2, format: wgpu::TextureFormat::Rgba8UnormSrgb, usage: wgpu::TextureUsage::COPY_SRC - | wgpu::TextureUsage::OUTPUT_ATTACHMENT + | wgpu::TextureUsage::RENDER_ATTACHMENT , label: None, };