diff --git a/Cargo.lock b/Cargo.lock index bfc3e711..b960d576 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,28 +57,6 @@ dependencies = [ name = "alignment" version = "0.1.0" -[[package]] -name = "alsa" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" -dependencies = [ - "alsa-sys", - "bitflags 1.3.2", - "libc", - "nix 0.23.2", -] - -[[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 = "android-activity" version = "0.4.1" @@ -91,9 +69,9 @@ dependencies = [ "jni-sys", "libc", "log", - "ndk 0.7.0", + "ndk", "ndk-context", - "ndk-sys 0.4.0", + "ndk-sys", "num_enum", ] @@ -136,15 +114,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - [[package]] name = "arrayref" version = "0.3.6" @@ -294,12 +263,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base64" version = "0.9.3" @@ -316,26 +279,6 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -[[package]] -name = "bindgen" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.102", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -459,7 +402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a22a6a8f622f797120d452c630b0ab12e1331a1a753e2039ce7868d4ac77b4ee" dependencies = [ "log", - "nix 0.24.2", + "nix", "slotmap", "thiserror", "vec_map", @@ -485,21 +428,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.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -518,7 +446,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" dependencies = [ - "approx 0.4.0", + "approx", "num-traits", ] @@ -534,17 +462,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "clang-sys" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -dependencies = [ - "glob", - "libc", - "libloading 0.7.3", -] - [[package]] name = "cmake" version = "0.1.48" @@ -576,16 +493,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - [[package]] name = "compute" version = "0.1.0" @@ -676,50 +583,6 @@ dependencies = [ "libc", ] -[[package]] -name = "coreaudio-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" -dependencies = [ - "bitflags 1.3.2", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" -dependencies = [ - "bindgen", -] - -[[package]] -name = "cpal" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f342c1b63e185e9953584ff2199726bf53850d96610a310e3aca09e9405a2d0b" -dependencies = [ - "alsa", - "core-foundation-sys", - "coreaudio-rs", - "jni", - "js-sys", - "libc", - "mach", - "ndk 0.7.0", - "ndk-context", - "oboe", - "once_cell", - "parking_lot 0.12.1", - "stdweb", - "thiserror", - "wasm-bindgen", - "web-sys", - "windows 0.37.0", -] - [[package]] name = "crc32fast" version = "1.3.2" @@ -855,12 +718,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fb4b71acc1405be2431a93892a79a0d82ed5ba6885649ddbdfc62caa4d67b1c" -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dispatch" version = "0.2.0" @@ -910,6 +767,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.2.8" @@ -944,7 +807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eb5f255b5980bb0c8cf676b675d1a99be40f316881444f44e0462eaf5df5ded" dependencies = [ "bit_field", - "flume", + "flume 0.10.14", "half", "lebe", "miniz_oxide 0.6.2", @@ -990,6 +853,18 @@ dependencies = [ "spin", ] +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1194,6 +1069,17 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + [[package]] name = "glam" version = "0.24.1" @@ -1223,9 +1109,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" dependencies = [ "js-sys", "slotmap", @@ -1234,41 +1120,12 @@ dependencies = [ ] [[package]] -name = "glyph_brush" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edefd123f28a0b1d41ec4a489c2b43020b369180800977801611084f342978d" -dependencies = [ - "glyph_brush_draw_cache", - "glyph_brush_layout", - "ordered-float", - "rustc-hash", - "twox-hash", -] - -[[package]] -name = "glyph_brush_draw_cache" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610" -dependencies = [ - "ab_glyph", - "crossbeam-channel", - "crossbeam-deque", - "linked-hash-map", - "rayon", - "rustc-hash", -] - -[[package]] -name = "glyph_brush_layout" -version = "0.2.3" +name = "glutin_wgl_sys" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" dependencies = [ - "ab_glyph", - "approx 0.5.1", - "xi-unicode", + "gl_generator", ] [[package]] @@ -1292,15 +1149,16 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" dependencies = [ "backtrace", "log", + "presser", "thiserror", "winapi", - "windows 0.44.0", + "windows", ] [[package]] @@ -1311,7 +1169,7 @@ checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" dependencies = [ "bitflags 1.3.2", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -1335,7 +1193,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1360,6 +1218,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" + [[package]] name = "hassle-rs" version = "0.10.0" @@ -1408,12 +1272,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "hound" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" - [[package]] name = "http" version = "0.2.8" @@ -1557,7 +1415,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", ] [[package]] @@ -1606,20 +1474,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - [[package]] name = "jni-sys" version = "0.3.0" @@ -1655,15 +1509,21 @@ dependencies = [ [[package]] name = "khronos-egl" -version = "4.1.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.7.3", + "libloading 0.8.0", "pkg-config", ] +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + [[package]] name = "kv-log-macro" version = "1.0.7" @@ -1679,12 +1539,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "leb128" version = "0.2.5" @@ -1732,12 +1586,6 @@ dependencies = [ "cc", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.1.4" @@ -1774,15 +1622,6 @@ dependencies = [ "winit", ] -[[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" @@ -1827,9 +1666,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ "bitflags 2.3.1", "block", @@ -1916,7 +1755,7 @@ checksum = "5f50357e1167a3ab92d6b3c7f4bf5f7fd13fde3f4b28bf0d5ea07b5100fdb6c0" dependencies = [ "bit-set", "bitflags 1.3.2", - "indexmap", + "indexmap 1.9.3", "log", "num-traits", "pp-rs", @@ -1928,32 +1767,15 @@ dependencies = [ [[package]] name = "naga" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271" -dependencies = [ - "bit-set", - "bitflags 1.3.2", - "indexmap", - "log", - "num-traits", - "pp-rs", - "rustc-hash", - "spirv", - "thiserror", -] - -[[package]] -name = "naga" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e" +checksum = "61d829abac9f5230a85d8cc83ec0879b4c09790208ae25b5ea031ef84562e071" dependencies = [ "bit-set", "bitflags 2.3.1", "codespan-reporting", "hexf-parse", - "indexmap", + "indexmap 2.1.0", "log", "num-traits", "petgraph", @@ -1991,19 +1813,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys 0.3.0", - "num_enum", - "thiserror", -] - [[package]] name = "ndk" version = "0.7.0" @@ -2012,7 +1821,7 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ "bitflags 1.3.2", "jni-sys", - "ndk-sys 0.4.0", + "ndk-sys", "num_enum", "raw-window-handle", "thiserror", @@ -2024,15 +1833,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.4.0" @@ -2042,19 +1842,6 @@ dependencies = [ "jni-sys", ] -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.24.2" @@ -2077,17 +1864,6 @@ dependencies = [ "minimal-lexical", ] -[[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 1.0.102", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -2203,29 +1979,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "oboe" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" -dependencies = [ - "jni", - "ndk 0.6.0", - "ndk-context", - "num-derive", - "num-traits", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" -dependencies = [ - "cc", -] - [[package]] name = "once_cell" version = "1.18.0" @@ -2286,15 +2039,6 @@ dependencies = [ "redox_syscall 0.3.5", ] -[[package]] -name = "ordered-float" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" -dependencies = [ - "num-traits", -] - [[package]] name = "owned_ttf_parser" version = "0.19.0" @@ -2364,12 +2108,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[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.2.0" @@ -2383,7 +2121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -2462,35 +2200,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" -[[package]] -name = "pong" -version = "0.1.0" -dependencies = [ - "anyhow", - "bytemuck", - "cfg-if", - "cgmath", - "console_error_panic_hook", - "console_log", - "env_logger", - "fs_extra", - "getrandom", - "glob", - "instant", - "log", - "naga 0.11.1", - "pollster", - "rand", - "rayon", - "rodio", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu", - "wgpu_glyph", - "winit", -] - [[package]] name = "pp-rs" version = "0.2.1" @@ -2501,10 +2210,10 @@ dependencies = [ ] [[package]] -name = "ppv-lite86" -version = "0.2.17" +name = "presser" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" [[package]] name = "proc-macro-crate" @@ -2541,36 +2250,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - [[package]] name = "range-alloc" version = "0.1.2" @@ -2712,16 +2391,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "rodio" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb10b653d5ec0e9411a2e7d46e2c7f4046fd87d35b9955bd73ba4108d69072b5" -dependencies = [ - "cpal", - "hound", -] - [[package]] name = "roxmltree" version = "0.14.1" @@ -2750,15 +2419,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.36.6" @@ -2785,15 +2445,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schannel" version = "0.1.20" @@ -2864,21 +2515,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "1.0.145" @@ -2922,21 +2558,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "shaderc" version = "0.8.0" @@ -2967,12 +2588,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - [[package]] name = "slab" version = "0.4.7" @@ -3009,7 +2624,7 @@ dependencies = [ "lazy_static", "log", "memmap2", - "nix 0.24.2", + "nix", "pkg-config", "wayland-client", "wayland-cursor", @@ -3064,55 +2679,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.102", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.102", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "strict-num" version = "0.1.1" @@ -3754,17 +3320,6 @@ dependencies = [ "winit", ] -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "rand", - "static_assertions", -] - [[package]] name = "unicode-bidi" version = "0.3.8" @@ -3855,16 +3410,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "walrus" version = "0.19.0" @@ -4076,7 +3621,7 @@ dependencies = [ "bitflags 1.3.2", "downcast-rs", "libc", - "nix 0.24.2", + "nix", "scoped-tls", "wayland-commons", "wayland-scanner", @@ -4089,7 +3634,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" dependencies = [ - "nix 0.24.2", + "nix", "once_cell", "smallvec", "wayland-sys", @@ -4101,7 +3646,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" dependencies = [ - "nix 0.24.2", + "nix", "wayland-client", "xcursor", ] @@ -4167,15 +3712,16 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7472f3b69449a8ae073f6ec41d05b6f846902d92a6c45313c50cb25857b736ce" +checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" dependencies = [ "arrayvec", "cfg-if", + "flume 0.11.0", "js-sys", "log", - "naga 0.13.0", + "naga 0.14.0", "parking_lot 0.12.1", "profiling", "raw-window-handle", @@ -4191,16 +3737,16 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecf7454d9386f602f7399225c92dd2fbdcde52c519bc8fb0bd6fbeb388075dc2" +checksum = "837e02ddcdc6d4a9b56ba4598f7fd4202a7699ab03f6ef4dcdebfad2c966aea6" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.3.1", "codespan-reporting", "log", - "naga 0.13.0", + "naga 0.14.0", "parking_lot 0.12.1", "profiling", "raw-window-handle", @@ -4214,9 +3760,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6654a13885a17f475e8324efb46dc6986d7aaaa98353330f8de2077b153d0101" +checksum = "1e30b9a8155c83868e82a8c5d3ce899de6c3961d2ef595de8fc168a1677fc2d8" dependencies = [ "android_system_properties", "arrayvec", @@ -4227,6 +3773,7 @@ dependencies = [ "core-graphics-types", "d3d12", "glow", + "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", "gpu-descriptor", @@ -4237,8 +3784,9 @@ dependencies = [ "libloading 0.8.0", "log", "metal", - "naga 0.13.0", + "naga 0.14.0", "objc", + "once_cell", "parking_lot 0.12.1", "profiling", "range-alloc", @@ -4268,26 +3816,15 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67" +checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" dependencies = [ "bitflags 2.3.1", "js-sys", "web-sys", ] -[[package]] -name = "wgpu_glyph" -version = "0.20.1" -source = "git+https://github.com/sotrh/wgpu_glyph.git#419f82a142d7bd54d28f9cd9c8ee761befb64ab6" -dependencies = [ - "bytemuck", - "glyph_brush", - "log", - "wgpu", -] - [[package]] name = "widestring" version = "1.0.2" @@ -4338,24 +3875,21 @@ dependencies = [ [[package]] name = "windows" -version = "0.37.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", + "windows-core", + "windows-targets 0.48.5", ] [[package]] -name = "windows" -version = "0.44.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] @@ -4452,12 +3986,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -4476,12 +4004,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" -[[package]] -name = "windows_i686_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -4500,12 +4022,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" -[[package]] -name = "windows_i686_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -4524,12 +4040,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -4560,12 +4070,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -4594,7 +4098,7 @@ dependencies = [ "libc", "log", "mio", - "ndk 0.7.0", + "ndk", "objc2", "once_cell", "orbclient", @@ -4642,12 +4146,6 @@ dependencies = [ "nom", ] -[[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.4" diff --git a/Cargo.toml b/Cargo.toml index afbc30ab..23f226cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,5 +16,5 @@ members = [ ] exclude = [ "code/showcase/imgui-demo", - #"code/showcase/pong", + "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 a9821b6b..ee518208 100644 --- a/code/beginner/tutorial1-window/Cargo.toml +++ b/code/beginner/tutorial1-window/Cargo.toml @@ -16,13 +16,13 @@ cfg-if = "1" winit = "0.28" env_logger = "0.10" log = "0.4" -wgpu = "0.17" +wgpu = "0.18" pollster = "0.3" [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.6" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "=0.2.87" wasm-bindgen-futures = "0.4.30" web-sys = { version = "0.3.53", features = [ diff --git a/code/beginner/tutorial2-surface/Cargo.toml b/code/beginner/tutorial2-surface/Cargo.toml index 21c9386f..baec9265 100644 --- a/code/beginner/tutorial2-surface/Cargo.toml +++ b/code/beginner/tutorial2-surface/Cargo.toml @@ -12,13 +12,13 @@ cfg-if = "1" winit = "0.28" env_logger = "0.10" log = "0.4" -wgpu = "0.17" +wgpu = "0.18" pollster = "0.3" [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.6" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/beginner/tutorial2-surface/src/challenge.rs b/code/beginner/tutorial2-surface/src/challenge.rs index 60045b30..789d64db 100644 --- a/code/beginner/tutorial2-surface/src/challenge.rs +++ b/code/beginner/tutorial2-surface/src/challenge.rs @@ -28,7 +28,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -150,10 +150,12 @@ impl State { resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Clear(self.clear_color), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); } diff --git a/code/beginner/tutorial2-surface/src/lib.rs b/code/beginner/tutorial2-surface/src/lib.rs index 4ff6e061..16baaf0c 100644 --- a/code/beginner/tutorial2-surface/src/lib.rs +++ b/code/beginner/tutorial2-surface/src/lib.rs @@ -29,7 +29,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -142,10 +142,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); } diff --git a/code/beginner/tutorial3-pipeline/Cargo.toml b/code/beginner/tutorial3-pipeline/Cargo.toml index 601a814c..1dec3c98 100644 --- a/code/beginner/tutorial3-pipeline/Cargo.toml +++ b/code/beginner/tutorial3-pipeline/Cargo.toml @@ -12,13 +12,13 @@ cfg-if = "1" winit = "0.28" env_logger = "0.10" log = "0.4" -wgpu = "0.17" +wgpu = "0.18" pollster = "0.3" [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.6" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/beginner/tutorial3-pipeline/src/challenge.rs b/code/beginner/tutorial3-pipeline/src/challenge.rs index 88721822..5bcdf59d 100644 --- a/code/beginner/tutorial3-pipeline/src/challenge.rs +++ b/code/beginner/tutorial3-pipeline/src/challenge.rs @@ -26,7 +26,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -255,10 +255,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(if self.use_color { diff --git a/code/beginner/tutorial3-pipeline/src/lib.rs b/code/beginner/tutorial3-pipeline/src/lib.rs index 95341fdb..c7fde053 100644 --- a/code/beginner/tutorial3-pipeline/src/lib.rs +++ b/code/beginner/tutorial3-pipeline/src/lib.rs @@ -28,7 +28,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -197,10 +197,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(&self.render_pipeline); diff --git a/code/beginner/tutorial4-buffer/Cargo.toml b/code/beginner/tutorial4-buffer/Cargo.toml index 8df23688..a6058563 100644 --- a/code/beginner/tutorial4-buffer/Cargo.toml +++ b/code/beginner/tutorial4-buffer/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] cfg-if = "1" winit = "0.28" -wgpu = "0.17" +wgpu = "0.18" env_logger = "0.10" log = "0.4" pollster = "0.3" @@ -21,7 +21,7 @@ bytemuck = { version = "1.12", features = [ "derive" ] } [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/beginner/tutorial4-buffer/src/challenge.rs b/code/beginner/tutorial4-buffer/src/challenge.rs index a6dd4d60..81f0f51c 100644 --- a/code/beginner/tutorial4-buffer/src/challenge.rs +++ b/code/beginner/tutorial4-buffer/src/challenge.rs @@ -89,7 +89,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -323,10 +323,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(&self.render_pipeline); diff --git a/code/beginner/tutorial4-buffer/src/lib.rs b/code/beginner/tutorial4-buffer/src/lib.rs index 3475034f..b28090cf 100644 --- a/code/beginner/tutorial4-buffer/src/lib.rs +++ b/code/beginner/tutorial4-buffer/src/lib.rs @@ -85,7 +85,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -269,10 +269,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(&self.render_pipeline); diff --git a/code/beginner/tutorial5-textures/Cargo.toml b/code/beginner/tutorial5-textures/Cargo.toml index 251eed69..8c99f203 100644 --- a/code/beginner/tutorial5-textures/Cargo.toml +++ b/code/beginner/tutorial5-textures/Cargo.toml @@ -14,7 +14,7 @@ bytemuck = { version = "1.12", features = [ "derive" ] } env_logger = "0.10" log = "0.4" pollster = "0.3" -wgpu = "0.17" +wgpu = "0.18" winit = "0.28" [dependencies.image] @@ -25,7 +25,7 @@ features = ["png", "jpeg"] [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/beginner/tutorial5-textures/src/challenge.rs b/code/beginner/tutorial5-textures/src/challenge.rs index 26765def..74d2808b 100644 --- a/code/beginner/tutorial5-textures/src/challenge.rs +++ b/code/beginner/tutorial5-textures/src/challenge.rs @@ -91,7 +91,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -354,10 +354,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); let bind_group = if self.is_space_pressed { diff --git a/code/beginner/tutorial5-textures/src/lib.rs b/code/beginner/tutorial5-textures/src/lib.rs index 8a5b5542..ed0b539e 100644 --- a/code/beginner/tutorial5-textures/src/lib.rs +++ b/code/beginner/tutorial5-textures/src/lib.rs @@ -91,7 +91,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -318,10 +318,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(&self.render_pipeline); diff --git a/code/beginner/tutorial6-uniforms/Cargo.toml b/code/beginner/tutorial6-uniforms/Cargo.toml index a0a08653..7331f606 100644 --- a/code/beginner/tutorial6-uniforms/Cargo.toml +++ b/code/beginner/tutorial6-uniforms/Cargo.toml @@ -15,7 +15,7 @@ cgmath = "0.18" env_logger = "0.10" log = "0.4" pollster = "0.3" -wgpu = "0.17" +wgpu = "0.18" winit = "0.28" [dependencies.image] @@ -26,7 +26,7 @@ features = ["png", "jpeg"] [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/beginner/tutorial6-uniforms/src/challenge.rs b/code/beginner/tutorial6-uniforms/src/challenge.rs index 63a55ffd..6f6bd9d4 100644 --- a/code/beginner/tutorial6-uniforms/src/challenge.rs +++ b/code/beginner/tutorial6-uniforms/src/challenge.rs @@ -241,7 +241,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -530,10 +530,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(&self.render_pipeline); diff --git a/code/beginner/tutorial6-uniforms/src/lib.rs b/code/beginner/tutorial6-uniforms/src/lib.rs index c5024d48..b226d20e 100644 --- a/code/beginner/tutorial6-uniforms/src/lib.rs +++ b/code/beginner/tutorial6-uniforms/src/lib.rs @@ -241,7 +241,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -526,10 +526,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(&self.render_pipeline); diff --git a/code/beginner/tutorial7-instancing/Cargo.toml b/code/beginner/tutorial7-instancing/Cargo.toml index 922dcbae..c06e87f3 100644 --- a/code/beginner/tutorial7-instancing/Cargo.toml +++ b/code/beginner/tutorial7-instancing/Cargo.toml @@ -15,7 +15,7 @@ cgmath = "0.18" env_logger = "0.10" log = "0.4" pollster = "0.3" -wgpu = "0.17" +wgpu = "0.18" winit = "0.28" [dependencies.image] @@ -26,7 +26,7 @@ features = ["png", "jpeg"] [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/beginner/tutorial7-instancing/src/challenge.rs b/code/beginner/tutorial7-instancing/src/challenge.rs index 47506cf0..3aa7b6d9 100644 --- a/code/beginner/tutorial7-instancing/src/challenge.rs +++ b/code/beginner/tutorial7-instancing/src/challenge.rs @@ -295,7 +295,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -630,10 +630,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/beginner/tutorial7-instancing/src/lib.rs b/code/beginner/tutorial7-instancing/src/lib.rs index 4d2fdb72..2aab25bc 100644 --- a/code/beginner/tutorial7-instancing/src/lib.rs +++ b/code/beginner/tutorial7-instancing/src/lib.rs @@ -302,7 +302,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -622,10 +622,12 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(&self.render_pipeline); diff --git a/code/beginner/tutorial8-depth/Cargo.toml b/code/beginner/tutorial8-depth/Cargo.toml index d153acf7..80eadc2a 100644 --- a/code/beginner/tutorial8-depth/Cargo.toml +++ b/code/beginner/tutorial8-depth/Cargo.toml @@ -15,7 +15,7 @@ cgmath = "0.18" env_logger = "0.10" pollster = "0.3" log = "0.4" -wgpu = "0.17" +wgpu = "0.18" winit = "0.28" [dependencies.image] @@ -26,7 +26,7 @@ features = ["png", "jpeg"] [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/beginner/tutorial8-depth/src/challenge.rs b/code/beginner/tutorial8-depth/src/challenge.rs index de46d59c..ade6b0e7 100644 --- a/code/beginner/tutorial8-depth/src/challenge.rs +++ b/code/beginner/tutorial8-depth/src/challenge.rs @@ -446,10 +446,12 @@ impl DepthPass { resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Load, - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(&self.render_pipeline); render_pass.set_bind_group(0, &self.bind_group, &[]); @@ -492,7 +494,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -826,17 +828,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_pass.texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/beginner/tutorial8-depth/src/lib.rs b/code/beginner/tutorial8-depth/src/lib.rs index 1039f3f7..900128bf 100644 --- a/code/beginner/tutorial8-depth/src/lib.rs +++ b/code/beginner/tutorial8-depth/src/lib.rs @@ -312,7 +312,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -643,17 +643,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/beginner/tutorial8-depth/src/texture.rs b/code/beginner/tutorial8-depth/src/texture.rs index 1e5dbfdc..afc8e002 100644 --- a/code/beginner/tutorial8-depth/src/texture.rs +++ b/code/beginner/tutorial8-depth/src/texture.rs @@ -1,5 +1,3 @@ -use std::num::NonZeroU32; - use anyhow::*; use image::GenericImageView; @@ -54,6 +52,7 @@ impl Texture { } } + #[allow(unused)] pub fn create_depth_texture_non_comparison_sampler( device: &wgpu::Device, config: &wgpu::SurfaceConfiguration, diff --git a/code/beginner/tutorial9-models/Cargo.toml b/code/beginner/tutorial9-models/Cargo.toml index 882670a1..f4dc95a0 100644 --- a/code/beginner/tutorial9-models/Cargo.toml +++ b/code/beginner/tutorial9-models/Cargo.toml @@ -16,7 +16,7 @@ env_logger = "0.10" pollster = "0.3" log = "0.4" tobj = { version = "3.2", features = ["async"]} -wgpu = "0.17" +wgpu = "0.18" winit = "0.28" [dependencies.image] @@ -28,7 +28,7 @@ features = ["png", "jpeg"] reqwest = { version = "0.11" } console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/beginner/tutorial9-models/src/lib.rs b/code/beginner/tutorial9-models/src/lib.rs index c910c842..90c0eeac 100644 --- a/code/beginner/tutorial9-models/src/lib.rs +++ b/code/beginner/tutorial9-models/src/lib.rs @@ -252,7 +252,7 @@ impl State { log::warn!("WGPU setup"); let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -554,17 +554,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/intermediate/tutorial10-lighting/Cargo.toml b/code/intermediate/tutorial10-lighting/Cargo.toml index 929ef949..0ddf957a 100644 --- a/code/intermediate/tutorial10-lighting/Cargo.toml +++ b/code/intermediate/tutorial10-lighting/Cargo.toml @@ -16,7 +16,7 @@ env_logger = "0.10" pollster = "0.3" log = "0.4" tobj = { version = "3.2", features = ["async"]} -wgpu = { version = "0.17"} +wgpu = { version = "0.18"} winit = "0.28" [dependencies.image] @@ -28,7 +28,7 @@ features = ["png", "jpeg"] reqwest = { version = "0.11" } console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/intermediate/tutorial10-lighting/src/lib.rs b/code/intermediate/tutorial10-lighting/src/lib.rs index 19f4db22..1a19d47a 100644 --- a/code/intermediate/tutorial10-lighting/src/lib.rs +++ b/code/intermediate/tutorial10-lighting/src/lib.rs @@ -347,7 +347,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -684,17 +684,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/intermediate/tutorial11-normals/Cargo.toml b/code/intermediate/tutorial11-normals/Cargo.toml index 3a4b1348..3dc611fd 100644 --- a/code/intermediate/tutorial11-normals/Cargo.toml +++ b/code/intermediate/tutorial11-normals/Cargo.toml @@ -16,7 +16,7 @@ env_logger = "0.10" pollster = "0.3" log = "0.4" tobj = { version = "3.2", features = ["async"]} -wgpu = { version = "0.17"} +wgpu = { version = "0.18"} winit = "0.28" [dependencies.image] @@ -28,7 +28,7 @@ features = ["png", "jpeg"] reqwest = { version = "0.11" } console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/intermediate/tutorial11-normals/src/lib.rs b/code/intermediate/tutorial11-normals/src/lib.rs index 0e3ae83e..f10bc174 100644 --- a/code/intermediate/tutorial11-normals/src/lib.rs +++ b/code/intermediate/tutorial11-normals/src/lib.rs @@ -347,7 +347,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -735,17 +735,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/intermediate/tutorial11-normals/src/resources.rs b/code/intermediate/tutorial11-normals/src/resources.rs index 505320f2..d076fbd5 100644 --- a/code/intermediate/tutorial11-normals/src/resources.rs +++ b/code/intermediate/tutorial11-normals/src/resources.rs @@ -189,7 +189,7 @@ pub async fn load_model( // Average the tangents/bitangents for (i, n) in triangles_included.into_iter().enumerate() { let denom = 1.0 / n as f32; - let mut v = &mut vertices[i]; + let v = &mut vertices[i]; v.tangent = (cgmath::Vector3::from(v.tangent) * denom).into(); v.bitangent = (cgmath::Vector3::from(v.bitangent) * denom).into(); } diff --git a/code/intermediate/tutorial12-camera/Cargo.toml b/code/intermediate/tutorial12-camera/Cargo.toml index 8907b2b0..53fd183b 100644 --- a/code/intermediate/tutorial12-camera/Cargo.toml +++ b/code/intermediate/tutorial12-camera/Cargo.toml @@ -16,7 +16,7 @@ env_logger = "0.10" pollster = "0.3" log = "0.4" tobj = { version = "3.2", features = ["async"]} -wgpu = { version = "0.17"} +wgpu = { version = "0.18"} winit = "0.28" instant = "0.1" @@ -29,7 +29,7 @@ features = ["png", "jpeg"] reqwest = { version = "0.11" } console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/intermediate/tutorial12-camera/src/lib.rs b/code/intermediate/tutorial12-camera/src/lib.rs index f2e62c31..3314bb58 100644 --- a/code/intermediate/tutorial12-camera/src/lib.rs +++ b/code/intermediate/tutorial12-camera/src/lib.rs @@ -227,7 +227,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -637,17 +637,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/intermediate/tutorial12-camera/src/resources.rs b/code/intermediate/tutorial12-camera/src/resources.rs index 505320f2..d076fbd5 100644 --- a/code/intermediate/tutorial12-camera/src/resources.rs +++ b/code/intermediate/tutorial12-camera/src/resources.rs @@ -189,7 +189,7 @@ pub async fn load_model( // Average the tangents/bitangents for (i, n) in triangles_included.into_iter().enumerate() { let denom = 1.0 / n as f32; - let mut v = &mut vertices[i]; + let v = &mut vertices[i]; v.tangent = (cgmath::Vector3::from(v.tangent) * denom).into(); v.bitangent = (cgmath::Vector3::from(v.bitangent) * denom).into(); } diff --git a/code/intermediate/tutorial12-camera/src/texture.rs b/code/intermediate/tutorial12-camera/src/texture.rs index 24f0ffc3..46e187d8 100644 --- a/code/intermediate/tutorial12-camera/src/texture.rs +++ b/code/intermediate/tutorial12-camera/src/texture.rs @@ -1,6 +1,5 @@ use anyhow::*; use image::GenericImageView; -use std::num::NonZeroU32; pub struct Texture { pub texture: wgpu::Texture, diff --git a/code/intermediate/tutorial13-hdr/Cargo.toml b/code/intermediate/tutorial13-hdr/Cargo.toml index bdb969f3..5499eeaf 100644 --- a/code/intermediate/tutorial13-hdr/Cargo.toml +++ b/code/intermediate/tutorial13-hdr/Cargo.toml @@ -16,7 +16,7 @@ env_logger = "0.10" pollster = "0.3" log = "0.4" tobj = { version = "3.2", features = ["async"]} -wgpu = { version = "0.17"} +wgpu = { version = "0.18"} winit = "0.28" instant = "0.1" diff --git a/code/intermediate/tutorial13-hdr/src/hdr.rs b/code/intermediate/tutorial13-hdr/src/hdr.rs index 36cf5fd3..337e357f 100644 --- a/code/intermediate/tutorial13-hdr/src/hdr.rs +++ b/code/intermediate/tutorial13-hdr/src/hdr.rs @@ -146,10 +146,12 @@ impl HdrPipeline { resolve_target: None, ops: Operations { load: wgpu::LoadOp::Load, - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); pass.set_pipeline(&self.pipeline); pass.set_bind_group(0, &self.bind_group, &[]); diff --git a/code/intermediate/tutorial13-hdr/src/lib.rs b/code/intermediate/tutorial13-hdr/src/lib.rs index d32a51a5..1446a3ea 100644 --- a/code/intermediate/tutorial13-hdr/src/lib.rs +++ b/code/intermediate/tutorial13-hdr/src/lib.rs @@ -250,7 +250,7 @@ impl State { backends: wgpu::Backends::BROWSER_WEBGPU, #[cfg(not(target_arch="wasm32"))] backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -737,17 +737,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); @@ -786,10 +788,12 @@ impl State { resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Load, - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); self.debug.draw_axis(&mut pass, &self.camera_bind_group); } diff --git a/code/intermediate/tutorial13-hdr/src/resources.rs b/code/intermediate/tutorial13-hdr/src/resources.rs index e1c3d340..dc30f538 100644 --- a/code/intermediate/tutorial13-hdr/src/resources.rs +++ b/code/intermediate/tutorial13-hdr/src/resources.rs @@ -356,7 +356,7 @@ impl HdrLoader { }); let mut encoder = device.create_command_encoder(&Default::default()); - let mut pass = encoder.begin_compute_pass(&wgpu::ComputePassDescriptor { label }); + let mut pass = encoder.begin_compute_pass(&wgpu::ComputePassDescriptor { label, timestamp_writes: None }); let num_workgroups = (dst_size + 15) / 16; pass.set_pipeline(&self.equirect_to_cubemap); diff --git a/code/intermediate/tutorial13-hdr/src/shader.wgsl b/code/intermediate/tutorial13-hdr/src/shader.wgsl index e30625a0..ec9d8c59 100644 --- a/code/intermediate/tutorial13-hdr/src/shader.wgsl +++ b/code/intermediate/tutorial13-hdr/src/shader.wgsl @@ -133,8 +133,7 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4 { let reflection = textureSample(env_map, env_sampler, world_reflect).rgb; let shininess = 0.1; - // let result = (diffuse_color + specular_color) * object_color.xyz + reflection * shininess; - let result = reflection; + let result = (diffuse_color + specular_color) * object_color.xyz + reflection * shininess; return vec4(result, object_color.a); } \ No newline at end of file diff --git a/code/intermediate/wip-terrain/Cargo.toml b/code/intermediate/wip-terrain/Cargo.toml index 7130d15e..c9df1883 100644 --- a/code/intermediate/wip-terrain/Cargo.toml +++ b/code/intermediate/wip-terrain/Cargo.toml @@ -16,7 +16,7 @@ env_logger = "0.10" pollster = "0.3" log = "0.4" tobj = { version = "3.2", features = ["async"]} -wgpu = { version = "0.17"} +wgpu = { version = "0.18"} winit = "0.28" instant = "0.1" @@ -29,7 +29,7 @@ features = ["png", "jpeg"] reqwest = { version = "0.11" } console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/intermediate/wip-terrain/src/lib.rs b/code/intermediate/wip-terrain/src/lib.rs index 5bae17a4..8cdaf983 100644 --- a/code/intermediate/wip-terrain/src/lib.rs +++ b/code/intermediate/wip-terrain/src/lib.rs @@ -228,7 +228,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -679,17 +679,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/intermediate/wip-terrain/src/resources.rs b/code/intermediate/wip-terrain/src/resources.rs index 5d6ce816..de2eaaea 100644 --- a/code/intermediate/wip-terrain/src/resources.rs +++ b/code/intermediate/wip-terrain/src/resources.rs @@ -205,7 +205,7 @@ pub async fn load_model( // Average the tangents/bitangents for (i, n) in triangles_included.into_iter().enumerate() { let denom = 1.0 / n as f32; - let mut v = &mut vertices[i]; + let v = &mut vertices[i]; v.tangent = (cgmath::Vector3::from(v.tangent) * denom).into(); v.bitangent = (cgmath::Vector3::from(v.bitangent) * denom).into(); } diff --git a/code/intermediate/wip-terrain/src/terrain.rs b/code/intermediate/wip-terrain/src/terrain.rs index e76937d3..e9ce0b4e 100644 --- a/code/intermediate/wip-terrain/src/terrain.rs +++ b/code/intermediate/wip-terrain/src/terrain.rs @@ -272,6 +272,7 @@ impl GenerateChunk for TerrainPipeline { let mut cpass = encoder.begin_compute_pass(&wgpu::ComputePassDescriptor { label: Some("TerrainPipeline: ComputePass"), + timestamp_writes: None, }); cpass.set_pipeline(&self.gen_pipeline); cpass.set_bind_group(0, &bind_group, &[]); diff --git a/code/showcase/compute/Cargo.toml b/code/showcase/compute/Cargo.toml index 4c97ad78..ab283948 100644 --- a/code/showcase/compute/Cargo.toml +++ b/code/showcase/compute/Cargo.toml @@ -14,7 +14,7 @@ image = "0.24" log = "0.4" rayon = "1.4" tobj = "2.0" -wgpu = "0.17" +wgpu = "0.18" winit = "0.28" [build-dependencies] diff --git a/code/showcase/compute/src/main.rs b/code/showcase/compute/src/main.rs index 224e81f9..208fe093 100644 --- a/code/showcase/compute/src/main.rs +++ b/code/showcase/compute/src/main.rs @@ -166,7 +166,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -589,17 +589,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/showcase/compute/src/model.rs b/code/showcase/compute/src/model.rs index 3d658e2b..b66c43fc 100644 --- a/code/showcase/compute/src/model.rs +++ b/code/showcase/compute/src/model.rs @@ -362,6 +362,7 @@ impl ModelLoader { { let mut pass = encoder.begin_compute_pass(&wgpu::ComputePassDescriptor { label: Some("Compute Pass"), + timestamp_writes: None, }); pass.set_pipeline(&self.pipeline); pass.set_bind_group(0, &calc_bind_group, &[]); diff --git a/code/showcase/compute/src/texture.rs b/code/showcase/compute/src/texture.rs index 75cd1fcc..239e8643 100644 --- a/code/showcase/compute/src/texture.rs +++ b/code/showcase/compute/src/texture.rs @@ -1,6 +1,6 @@ use anyhow::*; use image::GenericImageView; -use std::{num::NonZeroU32, path::Path}; +use std::path::Path; pub struct Texture { pub texture: wgpu::Texture, diff --git a/code/showcase/framework/Cargo.toml b/code/showcase/framework/Cargo.toml index f07e6e16..33446639 100644 --- a/code/showcase/framework/Cargo.toml +++ b/code/showcase/framework/Cargo.toml @@ -14,7 +14,7 @@ pollster = "0.3" image = "0.24.2" log = "0.4" tobj = "2.0" -wgpu = "0.17" +wgpu = "0.18" wgpu-subscriber = "0.1" winit = "0.28" diff --git a/code/showcase/framework/src/lib.rs b/code/showcase/framework/src/lib.rs index f62b6e8e..fb9cbc20 100644 --- a/code/showcase/framework/src/lib.rs +++ b/code/showcase/framework/src/lib.rs @@ -36,7 +36,7 @@ impl Display { let size = window.inner_size(); let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); let surface = unsafe { instance.create_surface(&window) }.unwrap(); let adapter = instance diff --git a/code/showcase/framework/src/shader_canvas.rs b/code/showcase/framework/src/shader_canvas.rs index 1f6d6b20..898b9386 100644 --- a/code/showcase/framework/src/shader_canvas.rs +++ b/code/showcase/framework/src/shader_canvas.rs @@ -85,10 +85,12 @@ impl ShaderCanvas { resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Load, - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); pass.set_bind_group(0, &self.simulation_bind_group, &[]); pass.set_pipeline(&self.pipeline); diff --git a/code/showcase/framework/src/texture.rs b/code/showcase/framework/src/texture.rs index 8aad4b1a..23893ddb 100644 --- a/code/showcase/framework/src/texture.rs +++ b/code/showcase/framework/src/texture.rs @@ -1,7 +1,7 @@ use anyhow::*; use image::GenericImageView; use std::path::Path; -use std::{mem, num::NonZeroU32}; +use std::mem; use crate::buffer; diff --git a/code/showcase/gifs/Cargo.toml b/code/showcase/gifs/Cargo.toml index 5cb80750..3611e061 100644 --- a/code/showcase/gifs/Cargo.toml +++ b/code/showcase/gifs/Cargo.toml @@ -14,7 +14,7 @@ pollster = "0.3" image = "0.24.2" log = "0.4" tobj = "3.1" -wgpu = "0.17" +wgpu = "0.18" winit = "0.28" gif = "0.11.4" futures-intrusive = "0.4" diff --git a/code/showcase/gifs/src/main.rs b/code/showcase/gifs/src/main.rs index 46731854..9d9d690f 100644 --- a/code/showcase/gifs/src/main.rs +++ b/code/showcase/gifs/src/main.rs @@ -6,7 +6,7 @@ use std::{iter, mem}; async fn run() { let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions::default()) @@ -100,10 +100,12 @@ async fn run() { b: c[2], a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); rpass.set_pipeline(&render_pipeline); diff --git a/code/showcase/imgui-demo/Cargo.toml b/code/showcase/imgui-demo/Cargo.toml index 36ff408a..97901deb 100644 --- a/code/showcase/imgui-demo/Cargo.toml +++ b/code/showcase/imgui-demo/Cargo.toml @@ -8,9 +8,9 @@ edition = "2018" [dependencies] anyhow = "1.0" -wgpu = "0.17" +wgpu = "0.18" pollster = "0.3" imgui = "0.7" -imgui-wgpu = "0.17" +imgui-wgpu = "0.18" imgui-winit-support = "0.7" framework = { path = "../framework" } \ No newline at end of file diff --git a/code/showcase/imgui-demo/src/main.rs b/code/showcase/imgui-demo/src/main.rs index d21c87e4..e532f003 100644 --- a/code/showcase/imgui-demo/src/main.rs +++ b/code/showcase/imgui-demo/src/main.rs @@ -119,7 +119,7 @@ impl framework::Demo for ImguiDemo { resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Load, - store: true, + store: wgpu::StoreOp::Store, }, }], depth_stencil_attachment: None, diff --git a/code/showcase/lost-window/Cargo.toml b/code/showcase/lost-window/Cargo.toml index 404745af..fe553fd8 100644 --- a/code/showcase/lost-window/Cargo.toml +++ b/code/showcase/lost-window/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] anyhow = "1" -wgpu = "0.17" +wgpu = "0.18" winit = "0.28" pollster = "0.3" \ No newline at end of file diff --git a/code/showcase/lost-window/src/main.rs b/code/showcase/lost-window/src/main.rs index c6b1cf7f..d0f898f0 100644 --- a/code/showcase/lost-window/src/main.rs +++ b/code/showcase/lost-window/src/main.rs @@ -89,6 +89,8 @@ async fn run() -> anyhow::Result<()> { ops: Default::default(), })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, })); queue.submit([encoder.finish()]); frame.present(); diff --git a/code/showcase/mouse-picking/Cargo.toml b/code/showcase/mouse-picking/Cargo.toml index e07dd666..7a045b79 100644 --- a/code/showcase/mouse-picking/Cargo.toml +++ b/code/showcase/mouse-picking/Cargo.toml @@ -16,7 +16,7 @@ env_logger = "0.10" pollster = "0.3" log = "0.4" tobj = { version = "3.2", features = ["async"]} -wgpu = { version = "0.17"} +wgpu = { version = "0.18"} winit = "0.28" instant = "0.1" @@ -29,7 +29,7 @@ features = ["png", "jpeg"] reqwest = { version = "0.11" } console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/showcase/mouse-picking/src/lib.rs b/code/showcase/mouse-picking/src/lib.rs index bcb26b5f..d6ff79b8 100644 --- a/code/showcase/mouse-picking/src/lib.rs +++ b/code/showcase/mouse-picking/src/lib.rs @@ -232,7 +232,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -684,17 +684,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/showcase/pong/Cargo.toml b/code/showcase/pong/Cargo.toml index a79b3baa..f0c4c1b2 100644 --- a/code/showcase/pong/Cargo.toml +++ b/code/showcase/pong/Cargo.toml @@ -15,7 +15,7 @@ anyhow = "1.0" bytemuck = { version = "1.12", features = [ "derive" ] } cgmath = "0.18" pollster = "0.3" -wgpu = { version = "0.17", features = ["spirv"]} +wgpu = { version = "0.18", features = ["spirv"]} #wgpu_glyph = { version = "0.20", path = "../../../../wgpu_glyph" } wgpu_glyph = { version = "0.20", git = "https://github.com/sotrh/wgpu_glyph.git" } rand = "0.8" @@ -35,7 +35,7 @@ web-sys = { version = "0.3.53", features = [ "Window", "Element", ]} -wgpu = { version = "0.17", features = ["spirv", "webgl"]} +wgpu = { version = "0.18", features = ["spirv", "webgl"]} [build-dependencies] anyhow = "1.0" diff --git a/code/showcase/pong/src/render/mod.rs b/code/showcase/pong/src/render/mod.rs index 077155c8..ecef2e02 100644 --- a/code/showcase/pong/src/render/mod.rs +++ b/code/showcase/pong/src/render/mod.rs @@ -42,7 +42,7 @@ impl Render { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety diff --git a/code/showcase/snow/Cargo.toml b/code/showcase/snow/Cargo.toml index 10034d49..2d29d267 100644 --- a/code/showcase/snow/Cargo.toml +++ b/code/showcase/snow/Cargo.toml @@ -11,5 +11,5 @@ bytemuck = { version = "1.13.1", features = ["derive"] } framework = { version = "0.1", path = "../framework"} glam = { version = "0.24.1", features = ["bytemuck"] } pollster = "0.3.0" -wgpu = "0.17.0" +wgpu = "0.18" winit = "0.28.6" diff --git a/code/showcase/snow/src/main.rs b/code/showcase/snow/src/main.rs index d785f94f..5be6ed65 100644 --- a/code/showcase/snow/src/main.rs +++ b/code/showcase/snow/src/main.rs @@ -302,6 +302,7 @@ impl framework::Demo for Snow { let mut encoder = display.device.create_command_encoder(&Default::default()); let mut move_pass = encoder.begin_compute_pass(&wgpu::ComputePassDescriptor { label: Some("move_pass"), + timestamp_writes: None, }); move_pass.set_pipeline(&self.move_particles); move_pass.set_bind_group(0, &self.particle_bind_groups[self.iteration % 2], &[]); @@ -331,10 +332,12 @@ impl framework::Demo for Snow { resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Clear(wgpu::Color::BLACK), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); draw_pass.set_pipeline(&self.draw_particles); diff --git a/code/showcase/threading/Cargo.toml b/code/showcase/threading/Cargo.toml index 7bb50f19..614bdb10 100644 --- a/code/showcase/threading/Cargo.toml +++ b/code/showcase/threading/Cargo.toml @@ -17,7 +17,7 @@ pollster = "0.3" log = "0.4" rayon = "1.4" # NEW! tobj = { version = "3.2", features = ["async"]} -wgpu = { version = "0.17"} +wgpu = { version = "0.18"} winit = "0.28" instant = "0.1" async-std = "1" @@ -31,7 +31,7 @@ features = ["png", "jpeg"] reqwest = { version = "0.11" } console_error_panic_hook = "0.1" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/code/showcase/threading/src/lib.rs b/code/showcase/threading/src/lib.rs index 7909fd33..2cc5ba23 100644 --- a/code/showcase/threading/src/lib.rs +++ b/code/showcase/threading/src/lib.rs @@ -226,7 +226,7 @@ impl State { // BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -645,17 +645,19 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_vertex_buffer(1, self.instance_buffer.slice(..)); diff --git a/code/showcase/windowless/Cargo.toml b/code/showcase/windowless/Cargo.toml index 5d0e6f9f..e826b254 100644 --- a/code/showcase/windowless/Cargo.toml +++ b/code/showcase/windowless/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] image = "0.24" shaderc = "0.8" -wgpu = { version = "0.17", features = ["spirv"] } +wgpu = { version = "0.18", features = ["spirv"] } pollster = "0.3" futures-intrusive = "0.4" diff --git a/code/showcase/windowless/src/main.rs b/code/showcase/windowless/src/main.rs index 49023989..653a6efe 100644 --- a/code/showcase/windowless/src/main.rs +++ b/code/showcase/windowless/src/main.rs @@ -3,7 +3,7 @@ use std::num::NonZeroU32; async fn run() { let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { @@ -147,10 +147,12 @@ async fn run() { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }; let mut render_pass = encoder.begin_render_pass(&render_pass_desc); diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index ab33e2a2..f9488657 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -60,6 +60,7 @@ module.exports = { title: 'News', collapsable: true, children: [ + '/news/0.18 and hdr/', '/news/0.17/', '/news/0.16/', '/news/0.15/', diff --git a/docs/beginner/tutorial1-window/README.md b/docs/beginner/tutorial1-window/README.md index 19b2a350..9181f0a4 100644 --- a/docs/beginner/tutorial1-window/README.md +++ b/docs/beginner/tutorial1-window/README.md @@ -11,7 +11,7 @@ For the beginner stuff, we're going to keep things very simple, we'll add things winit = "0.28" env_logger = "0.10" log = "0.4" -wgpu = "0.17" +wgpu = "0.18" ``` ## Using Rust's new resolver @@ -110,7 +110,7 @@ cfg-if = "1" [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.6" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4.30" web-sys = { version = "0.3", features = [ diff --git a/docs/beginner/tutorial2-surface/README.md b/docs/beginner/tutorial2-surface/README.md index eb7e5553..82c5358e 100644 --- a/docs/beginner/tutorial2-surface/README.md +++ b/docs/beginner/tutorial2-surface/README.md @@ -62,7 +62,7 @@ impl State { // Backends::all => Vulkan + Metal + DX12 + Browser WebGPU let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(), - dx12_shader_compiler: Default::default(), + ..Default::default() }); // # Safety @@ -264,13 +264,13 @@ cfg-if = "1" winit = "0.28" env_logger = "0.10" log = "0.4" -wgpu = "0.17" +wgpu = "0.18" pollster = "0.3" [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.6" console_log = "1.0" -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ @@ -423,7 +423,7 @@ Now we can get to clearing the screen (long time coming). We need to use the `en b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, @@ -511,7 +511,7 @@ Some(wgpu::RenderPassColorAttachment { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, }) ``` diff --git a/docs/beginner/tutorial3-pipeline/README.md b/docs/beginner/tutorial3-pipeline/README.md index 89ce88dc..2edb1675 100644 --- a/docs/beginner/tutorial3-pipeline/README.md +++ b/docs/beginner/tutorial3-pipeline/README.md @@ -308,7 +308,7 @@ If you run your program now, it'll take a little longer to start, but it will st a: 1.0, } ), - store: true, + store: wgpu::StoreOp::Store, } }) ], diff --git a/docs/beginner/tutorial5-textures/README.md b/docs/beginner/tutorial5-textures/README.md index 1d328390..7b0f8ee7 100644 --- a/docs/beginner/tutorial5-textures/README.md +++ b/docs/beginner/tutorial5-textures/README.md @@ -450,7 +450,7 @@ winit = "0.28" env_logger = "0.10" log = "0.4" pollster = "0.3" -wgpu = "0.17" +wgpu = "0.18" bytemuck = { version = "1.12", features = [ "derive" ] } anyhow = "1.0" # NEW! ``` diff --git a/docs/beginner/tutorial8-depth/README.md b/docs/beginner/tutorial8-depth/README.md index ef236db0..685b262e 100644 --- a/docs/beginner/tutorial8-depth/README.md +++ b/docs/beginner/tutorial8-depth/README.md @@ -158,7 +158,7 @@ let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { view: &self.depth_texture.view, depth_ops: Some(wgpu::Operations { load: wgpu::LoadOp::Clear(1.0), - store: true, + store: wgpu::StoreOp::Store, }), stencil_ops: None, }), diff --git a/docs/intermediate/tutorial13-hdr/readme.md b/docs/intermediate/tutorial13-hdr/readme.md index 956bfdd5..09368c3c 100644 --- a/docs/intermediate/tutorial13-hdr/readme.md +++ b/docs/intermediate/tutorial13-hdr/readme.md @@ -196,7 +196,7 @@ impl HdrPipeline { resolve_target: None, ops: Operations { load: wgpu::LoadOp::Load, - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, @@ -366,7 +366,7 @@ let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: Some( @@ -566,7 +566,7 @@ Consequently we are going to remove the webgl feature from `Cargo.toml`. This line in particular: ```toml -wgpu = { version = "0.17", features = ["webgl"]} +wgpu = { version = "0.18", features = ["webgl"]} ``` diff --git a/docs/news/0.16/readme.md b/docs/news/0.16/readme.md index b54cde1b..af88fd4b 100644 --- a/docs/news/0.16/readme.md +++ b/docs/news/0.16/readme.md @@ -29,7 +29,7 @@ In other news WebGPU has been added to Chrome 113 and up! Currently the Linux ve reqwest = { version = "0.11" } console_error_panic_hook = "0.1" console_log = "1.0" -# wgpu = { version = "0.17", features = ["webgl"]} +# wgpu = { version = "0.18", features = ["webgl"]} wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3", features = [ diff --git a/docs/news/0.18 and hdr/readme.md b/docs/news/0.18 and hdr/readme.md new file mode 100644 index 00000000..c8bc9d31 --- /dev/null +++ b/docs/news/0.18 and hdr/readme.md @@ -0,0 +1,27 @@ +# Update to 0.18 and HDR tutorial + +First let's go over some of the changes that occurred: + +1. `RenderPassDescriptor` now have 2 new fields: + `occlusion_query_set` and, `timestamp_writes`. I'm + setting both to `None` for now. +2. `ComputePassDescriptor` now has a `timestamp_writes` + field. +3. `InstanceDescriptor` now has some more fields, but I + opted to just use `..Default::default()` for all the + fields other than `backends`. + +## HDR tutorial + +I've been unsure how best to introduce compute shaders +as they are a big part of what makes WebGPU special, but +most browsers don't support them at the moment. With Chrome +rolling out support for WebGPU, I felt more confident +writing a tutorial for them. + +Also, I'm been interested learning how to load HDR images +from places like Polyhaven, so I decided to introduce +compute shaders by creating one that will load an HDR and +convert it to a Cubemap to be rendered. + +You can check it out [here](../../intermediate/tutorial13-hdr)! diff --git a/docs/showcase/gifs/README.md b/docs/showcase/gifs/README.md index 28d5a16e..e8515d92 100644 --- a/docs/showcase/gifs/README.md +++ b/docs/showcase/gifs/README.md @@ -112,7 +112,7 @@ for c in &colors { a: 1.0, } ), - store: true, + store: wgpu::StoreOp::Store, }, } ], diff --git a/docs/showcase/imgui-demo/README.md b/docs/showcase/imgui-demo/README.md index e0fafe89..f823b66b 100644 --- a/docs/showcase/imgui-demo/README.md +++ b/docs/showcase/imgui-demo/README.md @@ -14,7 +14,7 @@ This is not an in-depth guide on how to use Imgui. But here are some of the basi ```toml imgui = "0.7" -imgui-wgpu = "0.17" +imgui-wgpu = "0.18" imgui-winit-support = "0.7" ``` @@ -127,7 +127,7 @@ let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Load, - store: true, + store: wgpu::StoreOp::Store, }, }], depth_stencil_attachment: None, diff --git a/docs/showcase/pong/README.md b/docs/showcase/pong/README.md index 509dadf7..e2e831d6 100644 --- a/docs/showcase/pong/README.md +++ b/docs/showcase/pong/README.md @@ -268,8 +268,8 @@ anyhow = "1.0" bytemuck = { version = "1.12", features = [ "derive" ] } cgmath = "0.18" pollster = "0.3" -wgpu = { version = "0.17", features = ["spirv"]} -wgpu_glyph = "0.17" +wgpu = { version = "0.18", features = ["spirv"]} +wgpu_glyph = "0.18" rand = "0.8" rodio = { version = "0.15", default-features = false, features = ["wav"] } log = "0.4" @@ -287,7 +287,7 @@ web-sys = { version = "0.3.53", features = [ "Window", "Element", ]} -wgpu = { version = "0.17", features = ["spirv", "webgl"]} +wgpu = { version = "0.18", features = ["spirv", "webgl"]} [build-dependencies] anyhow = "1.0" diff --git a/docs/showcase/windowless/README.md b/docs/showcase/windowless/README.md index f3563001..02fc4fa6 100644 --- a/docs/showcase/windowless/README.md +++ b/docs/showcase/windowless/README.md @@ -100,7 +100,7 @@ Update dependencies to support SPIR-V module. [dependencies] image = "0.23" shaderc = "0.7" -wgpu = { version = "0.17", features = ["spirv"] } +wgpu = { version = "0.18", features = ["spirv"] } pollster = "0.3" ``` @@ -207,7 +207,7 @@ The `RenderPass` is where things get interesting. A render pass requires at leas b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, } ], diff --git a/run-all.sh b/run-all.sh index fb34500f..c4faa403 100755 --- a/run-all.sh +++ b/run-all.sh @@ -20,7 +20,7 @@ cargo run --bin tutorial9-models & cargo run --bin tutorial10-lighting & cargo run --bin tutorial11-normals & cargo run --bin tutorial12-camera & -cargo run --bin tutorial13-terrain & +cargo run --bin tutorial13-hdr & cargo run --bin windowless & cargo run --bin gifs & cargo run --bin compute