From d29d22dd0a973e8697d1253235ed877b03253ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= <jcapucho7@gmail.com>
Date: Tue, 17 Aug 2021 23:15:29 +0100
Subject: [PATCH 01/24] update to wgpu 0.18

---
 Cargo.lock                                    | 858 +++++++++---------
 Cargo.toml                                    |  29 +-
 flake.nix                                     |   4 +
 voxygen/Cargo.toml                            |  17 +-
 voxygen/egui/Cargo.toml                       |   5 +-
 voxygen/egui/src/admin.rs                     |   8 +-
 voxygen/egui/src/experimental_shaders.rs      |   4 +-
 voxygen/egui/src/lib.rs                       |  32 +-
 voxygen/egui/src/widgets.rs                   |  10 +-
 voxygen/src/hud/settings_window/video.rs      |   5 +-
 voxygen/src/menu/char_selection/mod.rs        |   3 +-
 voxygen/src/menu/dummy_scene.rs               |   2 +-
 voxygen/src/menu/main/mod.rs                  |   3 +-
 voxygen/src/render/buffer.rs                  |   6 +-
 voxygen/src/render/consts.rs                  |   2 +-
 voxygen/src/render/error.rs                   |  15 +-
 voxygen/src/render/instances.rs               |   2 +-
 voxygen/src/render/model.rs                   |   4 +-
 voxygen/src/render/pipelines/blit.rs          |  22 +-
 voxygen/src/render/pipelines/bloom.rs         |  20 +-
 voxygen/src/render/pipelines/clouds.rs        |  34 +-
 voxygen/src/render/pipelines/debug.rs         |  24 +-
 voxygen/src/render/pipelines/figure.rs        |  33 +-
 voxygen/src/render/pipelines/fluid.rs         |  22 +-
 voxygen/src/render/pipelines/lod_object.rs    |  24 +-
 voxygen/src/render/pipelines/lod_terrain.rs   |  28 +-
 voxygen/src/render/pipelines/mod.rs           |  85 +-
 voxygen/src/render/pipelines/particle.rs      |  25 +-
 voxygen/src/render/pipelines/postprocess.rs   |  37 +-
 .../src/render/pipelines/rain_occlusion.rs    |  16 +-
 voxygen/src/render/pipelines/rope.rs          |  19 +-
 voxygen/src/render/pipelines/shadow.rs        |  22 +-
 voxygen/src/render/pipelines/skybox.rs        |  22 +-
 voxygen/src/render/pipelines/sprite.rs        |  26 +-
 voxygen/src/render/pipelines/terrain.rs       |  42 +-
 voxygen/src/render/pipelines/trail.rs         |  15 +-
 voxygen/src/render/pipelines/ui.rs            |  50 +-
 voxygen/src/render/renderer.rs                | 202 +++--
 voxygen/src/render/renderer/drawer.rs         | 245 +++--
 .../src/render/renderer/pipeline_creation.rs  |  85 +-
 .../src/render/renderer/rain_occlusion_map.rs |  11 +-
 voxygen/src/render/renderer/screenshot.rs     | 202 ++---
 voxygen/src/render/renderer/shadow_map.rs     |  14 +-
 voxygen/src/render/texture.rs                 |  21 +-
 voxygen/src/scene/terrain.rs                  |   9 +-
 voxygen/src/session/mod.rs                    |   3 +-
 voxygen/src/ui/graphic/mod.rs                 |   9 +-
 voxygen/src/window.rs                         |  13 +-
 48 files changed, 1281 insertions(+), 1108 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f61e21c5e..bccf52ed92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39"
 dependencies = [
  "ab_glyph_rasterizer",
- "owned_ttf_parser 0.19.0",
+ "owned_ttf_parser",
 ]
 
 [[package]]
@@ -278,20 +278,14 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "as-raw-xcb-connection"
@@ -307,9 +301,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
 
 [[package]]
 name = "ash"
-version = "0.32.1"
+version = "0.37.3+1.3.251"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06063a002a77d2734631db74e8f4ce7148b77fe522e6bca46f2ae7774fd48112"
+checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
 dependencies = [
  "libloading 0.7.4",
 ]
@@ -326,7 +320,7 @@ dependencies = [
  "crossbeam-channel",
  "log",
  "notify",
- "ron 0.8.1",
+ "ron",
  "serde",
  "serde_json",
  "sync_file",
@@ -484,12 +478,6 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.3"
@@ -574,7 +562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec",
  "constant_time_eq 0.2.6",
 ]
 
@@ -681,7 +669,7 @@ dependencies = [
  "bitflags 1.3.2",
  "log",
  "nix 0.25.1",
- "slotmap 1.0.6",
+ "slotmap",
  "thiserror",
  "vec_map",
 ]
@@ -915,6 +903,16 @@ dependencies = [
  "objc_id",
 ]
 
+[[package]]
+name = "clipboard_macos"
+version = "0.1.0"
+source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
+dependencies = [
+ "objc",
+ "objc-foundation",
+ "objc_id",
+]
+
 [[package]]
 name = "clipboard_wayland"
 version = "0.2.0"
@@ -924,6 +922,14 @@ dependencies = [
  "smithay-clipboard",
 ]
 
+[[package]]
+name = "clipboard_wayland"
+version = "0.2.0"
+source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
+dependencies = [
+ "smithay-clipboard",
+]
+
 [[package]]
 name = "clipboard_x11"
 version = "0.4.0"
@@ -934,6 +940,15 @@ dependencies = [
  "x11rb 0.9.0",
 ]
 
+[[package]]
+name = "clipboard_x11"
+version = "0.4.0"
+source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
+dependencies = [
+ "thiserror",
+ "x11rb 0.9.0",
+]
+
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
@@ -963,7 +978,7 @@ dependencies = [
  "cocoa-foundation",
  "core-foundation",
  "core-graphics",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
  "objc",
 ]
@@ -978,7 +993,7 @@ dependencies = [
  "block",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
  "objc",
 ]
@@ -1005,6 +1020,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
+[[package]]
+name = "com-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+
 [[package]]
 name = "combine"
 version = "4.6.6"
@@ -1072,12 +1093,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
-[[package]]
-name = "copyless"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536"
-
 [[package]]
 name = "copypasta"
 version = "0.8.2"
@@ -1117,7 +1132,7 @@ dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
 ]
 
@@ -1213,7 +1228,7 @@ version = "0.91.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "bumpalo",
  "cranelift-bforest",
  "cranelift-codegen-meta",
@@ -1512,12 +1527,12 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 
 [[package]]
 name = "d3d12"
-version = "0.4.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c"
+checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
 dependencies = [
- "bitflags 1.3.2",
- "libloading 0.7.4",
+ "bitflags 2.4.0",
+ "libloading 0.8.0",
  "winapi",
 ]
 
@@ -1721,7 +1736,7 @@ dependencies = [
  "anyhow",
  "app_dirs2",
  "async-trait",
- "base64 0.21.3",
+ "base64",
  "bitflags 2.4.0",
  "crossbeam-channel",
  "num-traits",
@@ -1794,28 +1809,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c4a817d8b683f6e649aed359aab0c47a875377516bb5791d0f7e46d9066d209"
 
 [[package]]
-name = "egui"
-version = "0.12.0"
+name = "ecolor"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "788148861d80b87d28d64440a3d31cae190e50ccc3ea585597466d38428365d7"
+checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af"
 dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "egui"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7"
+dependencies = [
+ "ahash 0.8.7",
  "epaint",
+ "nohash-hasher",
+]
+
+[[package]]
+name = "egui_plot"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b"
+dependencies = [
+ "egui",
 ]
 
 [[package]]
 name = "egui_wgpu_backend"
-version = "0.8.0"
-source = "git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=63a002c6a9b6c016e45806dd065864431caab621#63a002c6a9b6c016e45806dd065864431caab621"
+version = "0.26.0"
+source = "git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=34691d4e9149deb9cd0bb8cbb5a56bffebf47588#34691d4e9149deb9cd0bb8cbb5a56bffebf47588"
 dependencies = [
  "bytemuck",
- "epi",
+ "egui",
  "wgpu",
 ]
 
 [[package]]
 name = "egui_winit_platform"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/egui_winit_platform.git?tag=veloren-winit-0.28#99685556bf323cb6b57565ae63aaf934457e95c0"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff2b0729f7c0ae1d7fb4a95aa4c3432d1a1d03476b22b2946247504a012cea4"
 dependencies = [
  "egui",
  "winit",
@@ -1829,9 +1865,12 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "emath"
-version = "0.12.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e73d6c8c70eadb71756fbbc3c303ab25e163b46b656886dd250de5636efea12"
+checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0"
+dependencies = [
+ "bytemuck",
+]
 
 [[package]]
 name = "endian-type"
@@ -1903,24 +1942,17 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.12.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e2db640801230bdda80629bc3a063927a462f5eaf38a98da676954e78ccb99"
+checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e"
 dependencies = [
- "ahash 0.7.6",
- "atomic_refcell",
+ "ab_glyph",
+ "ahash 0.8.7",
+ "bytemuck",
+ "ecolor",
  "emath",
- "ordered-float 2.10.0",
- "rusttype 0.9.3",
-]
-
-[[package]]
-name = "epi"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c4f6cbede1fc8f836384f85295a59199a4825940abcc3a8a29cfe2e3c37583"
-dependencies = [
- "egui",
+ "nohash-hasher",
+ "parking_lot 0.12.1",
 ]
 
 [[package]]
@@ -2066,12 +2098,6 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
 
-[[package]]
-name = "fixedbitset"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
-
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -2138,6 +2164,18 @@ dependencies = [
  "thiserror",
 ]
 
+[[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 0.9.8",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -2150,7 +2188,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2 1.0.66",
+ "quote 1.0.33",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -2159,6 +2218,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.0"
@@ -2333,152 +2398,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if 1.0.0",
+ "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "gfx-auxil"
-version = "0.9.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-dependencies = [
- "fxhash",
- "gfx-hal",
- "spirv_cross",
-]
-
-[[package]]
-name = "gfx-backend-dx11"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-dependencies = [
- "arrayvec 0.7.4",
- "bitflags 1.3.2",
- "gfx-auxil",
- "gfx-hal",
- "libloading 0.7.4",
- "log",
- "parking_lot 0.11.2",
- "range-alloc",
- "raw-window-handle 0.3.4",
- "smallvec",
- "spirv_cross",
- "thunderdome",
- "winapi",
- "wio",
-]
-
-[[package]]
-name = "gfx-backend-dx12"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-dependencies = [
- "arrayvec 0.7.4",
- "bit-set",
- "bitflags 1.3.2",
- "d3d12",
- "gfx-auxil",
- "gfx-hal",
- "log",
- "parking_lot 0.11.2",
- "range-alloc",
- "raw-window-handle 0.3.4",
- "smallvec",
- "spirv_cross",
- "thunderdome",
- "winapi",
-]
-
-[[package]]
-name = "gfx-backend-empty"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-dependencies = [
- "gfx-hal",
- "log",
- "raw-window-handle 0.3.4",
-]
-
-[[package]]
-name = "gfx-backend-gl"
-version = "0.8.1"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-dependencies = [
- "arrayvec 0.7.4",
- "bitflags 1.3.2",
- "fxhash",
- "gfx-auxil",
- "gfx-hal",
- "glow",
- "js-sys",
- "khronos-egl",
- "libloading 0.7.4",
- "log",
- "naga",
- "parking_lot 0.11.2",
- "raw-window-handle 0.3.4",
- "spirv_cross",
  "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "gfx-backend-metal"
-version = "0.8.1"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-dependencies = [
- "arrayvec 0.7.4",
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation",
- "copyless",
- "foreign-types",
- "fxhash",
- "gfx-auxil",
- "gfx-hal",
- "log",
- "metal",
- "naga",
- "objc",
- "parking_lot 0.11.2",
- "profiling",
- "range-alloc",
- "raw-window-handle 0.3.4",
- "spirv_cross",
- "storage-map",
-]
-
-[[package]]
-name = "gfx-backend-vulkan"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-dependencies = [
- "arrayvec 0.7.4",
- "ash",
- "byteorder",
- "core-graphics-types",
- "gfx-hal",
- "inplace_it",
- "libloading 0.7.4",
- "log",
- "naga",
- "objc",
- "parking_lot 0.11.2",
- "raw-window-handle 0.3.4",
- "renderdoc-sys",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "gfx-hal"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-dependencies = [
- "bitflags 1.3.2",
- "naga",
- "raw-window-handle 0.3.4",
- "thiserror",
 ]
 
 [[package]]
@@ -2533,6 +2456,17 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
+[[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.10.2"
@@ -2550,16 +2484,25 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glow"
-version = "0.9.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b80b98efaa8a34fce11d60dd2ce2760d5d83c373cbcc73bb87c2a3a84a54108"
+checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4"
 dependencies = [
  "js-sys",
- "slotmap 0.4.3",
+ "slotmap",
  "wasm-bindgen",
  "web-sys",
 ]
 
+[[package]]
+name = "glutin_wgl_sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
+dependencies = [
+ "gl_generator",
+]
+
 [[package]]
 name = "glyph_brush"
 version = "0.7.7"
@@ -2600,32 +2543,46 @@ dependencies = [
 
 [[package]]
 name = "gpu-alloc"
-version = "0.4.7"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc1b6ca374e81862526786d9cb42357ce03706ed1b8761730caafd02ab91f3a"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "gpu-alloc-types",
 ]
 
 [[package]]
 name = "gpu-alloc-types"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
+]
+
+[[package]]
+name = "gpu-allocator"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad"
+dependencies = [
+ "backtrace",
+ "log",
+ "presser",
+ "thiserror",
+ "winapi",
+ "windows 0.51.1",
 ]
 
 [[package]]
 name = "gpu-descriptor"
-version = "0.1.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a70f1e87a3840ed6a3e99e02c2b861e4dbdf26f0d07e38f42ea5aff46cfce2"
+checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a"
 dependencies = [
  "bitflags 1.3.2",
  "gpu-descriptor-types",
- "hashbrown 0.9.1",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -2729,6 +2686,21 @@ dependencies = [
  "hashbrown 0.14.0",
 ]
 
+[[package]]
+name = "hassle-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+dependencies = [
+ "bitflags 1.3.2",
+ "com-rs",
+ "libc",
+ "libloading 0.7.4",
+ "thiserror",
+ "widestring",
+ "winapi",
+]
+
 [[package]]
 name = "heapless"
 version = "0.7.16"
@@ -2769,6 +2741,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hexf-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
 [[package]]
 name = "hibitset"
 version = "0.6.4"
@@ -2893,12 +2871,12 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.4.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
+source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
 
 [[package]]
 name = "iced_futures"
 version = "0.3.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
+source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
 dependencies = [
  "futures",
  "log",
@@ -2908,7 +2886,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.2.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
+source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
 dependencies = [
  "bytemuck",
  "glam",
@@ -2921,7 +2899,7 @@ dependencies = [
 [[package]]
 name = "iced_native"
 version = "0.4.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
+source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -2933,7 +2911,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.3.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
+source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
 dependencies = [
  "iced_core",
 ]
@@ -2941,7 +2919,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.3.0"
-source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
+source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
 dependencies = [
  "iced_futures",
  "iced_graphics",
@@ -2949,7 +2927,7 @@ dependencies = [
  "log",
  "thiserror",
  "winapi",
- "window_clipboard",
+ "window_clipboard 0.2.3",
  "winit",
 ]
 
@@ -3009,6 +2987,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.0",
+ "serde",
 ]
 
 [[package]]
@@ -3040,12 +3019,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "inplace_it"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e567468c50f3d4bc7397702e09b380139f9b9288b4e909b070571007f8b5bf78"
-
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -3197,14 +3170,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.4",
+ "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 = "kiddo"
 version = "0.2.5"
@@ -3533,16 +3513,17 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.22.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c12e48c737ee9a55e8bb2352bcde588f79ae308d3529ee888f7cc0f469b5777"
+checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "block",
- "cocoa-foundation",
- "foreign-types",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
  "log",
  "objc",
+ "paste",
 ]
 
 [[package]]
@@ -3654,19 +3635,34 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.4.0"
-source = "git+https://github.com/gfx-rs/naga?tag=gfx-25#057d03ad86f18e3bb3866b20901d8d4e892dd3d6"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61d829abac9f5230a85d8cc83ec0879b4c09790208ae25b5ea031ef84562e071"
 dependencies = [
  "bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "codespan-reporting",
- "fxhash",
+ "hexf-parse",
+ "indexmap 2.0.0",
  "log",
  "num-traits",
- "petgraph 0.5.1",
- "rose_tree",
- "spirv_headers",
+ "petgraph 0.6.4",
+ "pp-rs",
+ "rustc-hash",
+ "serde",
+ "spirv",
+ "termcolor",
  "thiserror",
+ "unicode-xid 0.2.4",
+]
+
+[[package]]
+name = "nanorand"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
+dependencies = [
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -3841,6 +3837,12 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "nohash-hasher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+
 [[package]]
 name = "noise"
 version = "0.7.0"
@@ -4268,15 +4270,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "ordered-float"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "ordered-float"
 version = "3.9.1"
@@ -4292,22 +4285,13 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
-[[package]]
-name = "owned_ttf_parser"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb"
-dependencies = [
- "ttf-parser 0.15.2",
-]
-
 [[package]]
 name = "owned_ttf_parser"
 version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4"
 dependencies = [
- "ttf-parser 0.19.1",
+ "ttf-parser",
 ]
 
 [[package]]
@@ -4419,7 +4403,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a"
 dependencies = [
- "base64 0.21.3",
+ "base64",
  "serde",
 ]
 
@@ -4438,16 +4422,6 @@ dependencies = [
  "fixedbitset 0.1.9",
 ]
 
-[[package]]
-name = "petgraph"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
-dependencies = [
- "fixedbitset 0.2.0",
- "indexmap 1.9.3",
-]
-
 [[package]]
 name = "petgraph"
 version = "0.6.4"
@@ -4582,12 +4556,27 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "pp-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee"
+dependencies = [
+ "unicode-xid 0.2.4",
+]
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "presser"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -4911,8 +4900,9 @@ dependencies = [
 
 [[package]]
 name = "range-alloc"
-version = "0.1.2"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
 [[package]]
 name = "raw-window-handle"
@@ -5131,9 +5121,9 @@ dependencies = [
 
 [[package]]
 name = "renderdoc-sys"
-version = "0.7.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
+checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
 
 [[package]]
 name = "ring"
@@ -5211,24 +5201,13 @@ dependencies = [
  "lewton",
 ]
 
-[[package]]
-name = "ron"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4"
-dependencies = [
- "base64 0.13.1",
- "bitflags 1.3.2",
- "serde",
-]
-
 [[package]]
 name = "ron"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.21.3",
+ "base64",
  "bitflags 2.4.0",
  "serde",
  "serde_derive",
@@ -5240,15 +5219,6 @@ version = "0.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "082f11ffa03bbef6c2c6ea6bea1acafaade2fd9050ae0234ab44a2153742b058"
 
-[[package]]
-name = "rose_tree"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284de9dae38774e2813aaabd7e947b4a6fe9b8c58c2309f754a487cdd50de1c2"
-dependencies = [
- "petgraph 0.5.1",
-]
-
 [[package]]
 name = "roxmltree"
 version = "0.14.1"
@@ -5289,7 +5259,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e71971821b3ae0e769e4a4328dbcb517607b434db7697e9aba17203ec14e46a"
 dependencies = [
- "base64 0.21.3",
+ "base64",
  "blake2b_simd",
  "constant_time_eq 0.3.0",
 ]
@@ -5381,7 +5351,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "base64 0.21.3",
+ "base64",
 ]
 
 [[package]]
@@ -5419,16 +5389,6 @@ dependencies = [
  "stb_truetype",
 ]
 
-[[package]]
-name = "rusttype"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967"
-dependencies = [
- "ab_glyph_rasterizer",
- "owned_ttf_parser 0.15.2",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.14"
@@ -5772,7 +5732,7 @@ version = "0.15.0"
 source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85"
 dependencies = [
  "ahash 0.8.7",
- "arrayvec 0.7.4",
+ "arrayvec",
  "atomic_refcell",
  "rayon",
  "shred-derive",
@@ -5870,12 +5830,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 
-[[package]]
-name = "slotmap"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf34684c5767b87de9119790e92e9a1d60056be2ceeaf16a8e6ef13082aeab1"
-
 [[package]]
 name = "slotmap"
 version = "1.0.6"
@@ -5997,21 +5951,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "spirv_cross"
-version = "0.23.1"
+name = "spirv"
+version = "0.2.0+1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60647fadbf83c4a72f0d7ea67a7ca3a81835cf442b8deae5c134c3e0055b2e14"
-dependencies = [
- "cc",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "spirv_headers"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f5b132530b1ac069df335577e3581765995cba5a13995cdbbdbc8fb057c532c"
+checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
 dependencies = [
  "bitflags 1.3.2",
  "num-traits",
@@ -6115,15 +6058,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
-[[package]]
-name = "storage-map"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418bb14643aa55a7841d5303f72cf512cfb323b8cc221d51580500a1ca75206c"
-dependencies = [
- "lock_api 0.4.10",
-]
-
 [[package]]
 name = "str-buf"
 version = "1.0.6"
@@ -6299,12 +6233,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "thunderdome"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f685624f172cd0bde6f3363412455e81c018f2379fdf5a218e0be003f1bba642"
-
 [[package]]
 name = "time"
 version = "0.2.27"
@@ -6387,7 +6315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec",
  "bytemuck",
  "cfg-if 1.0.0",
  "png",
@@ -6696,12 +6624,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
-[[package]]
-name = "ttf-parser"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd"
-
 [[package]]
 name = "ttf-parser"
 version = "0.19.1"
@@ -6924,7 +6846,7 @@ dependencies = [
  "num 0.4.1",
  "quinn",
  "rayon",
- "ron 0.8.1",
+ "ron",
  "rustyline",
  "serde",
  "specs",
@@ -6987,14 +6909,14 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rayon",
- "ron 0.8.1",
+ "ron",
  "roots",
  "serde",
  "serde_json",
  "serde_repr",
  "sha2",
  "slab",
- "slotmap 1.0.6",
+ "slotmap",
  "specs",
  "spin_sleep",
  "strum",
@@ -7016,7 +6938,7 @@ dependencies = [
  "hashbrown 0.13.2",
  "image",
  "lazy_static",
- "ron 0.8.1",
+ "ron",
  "serde",
  "tracing",
  "walkdir",
@@ -7223,7 +7145,7 @@ dependencies = [
  "rayon",
  "rmp-serde",
  "serde",
- "slotmap 1.0.6",
+ "slotmap",
  "tracing",
  "vek 0.15.8",
  "veloren-common",
@@ -7257,7 +7179,7 @@ dependencies = [
  "rand 0.8.5",
  "rayon",
  "refinery",
- "ron 0.8.1",
+ "ron",
  "rusqlite",
  "rustls",
  "rustls-pemfile",
@@ -7310,7 +7232,7 @@ dependencies = [
  "mimalloc",
  "num_cpus",
  "prometheus",
- "ron 0.8.1",
+ "ron",
  "serde",
  "shell-words",
  "signal-hook 0.3.17",
@@ -7373,7 +7295,7 @@ dependencies = [
  "rand_chacha 0.3.1",
  "rayon",
  "rodio",
- "ron 0.8.1",
+ "ron",
  "serde",
  "shaderc",
  "slab",
@@ -7400,6 +7322,7 @@ dependencies = [
  "veloren-world",
  "wgpu",
  "wgpu-profiler",
+ "window_clipboard 0.2.4",
  "winit",
  "winres",
 ]
@@ -7420,6 +7343,7 @@ name = "veloren-voxygen-egui"
 version = "0.9.0"
 dependencies = [
  "egui",
+ "egui_plot",
  "egui_winit_platform",
  "lazy_static",
  "veloren-client",
@@ -7469,7 +7393,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rayon",
- "ron 0.8.1",
+ "ron",
  "rstar",
  "rusqlite",
  "serde",
@@ -7954,9 +7878,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.50"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7974,71 +7898,118 @@ dependencies = [
 
 [[package]]
 name = "wgpu"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24"
 dependencies = [
- "arrayvec 0.5.2",
+ "arrayvec",
+ "cfg-if 1.0.0",
+ "flume",
  "js-sys",
  "log",
  "naga",
- "parking_lot 0.11.2",
- "raw-window-handle 0.3.4",
+ "parking_lot 0.12.1",
+ "profiling",
+ "raw-window-handle 0.5.2",
  "serde",
  "smallvec",
+ "static_assertions",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
  "wgpu-core",
+ "wgpu-hal",
  "wgpu-types",
 ]
 
 [[package]]
 name = "wgpu-core"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "837e02ddcdc6d4a9b56ba4598f7fd4202a7699ab03f6ef4dcdebfad2c966aea6"
 dependencies = [
- "arrayvec 0.5.2",
- "bitflags 1.3.2",
- "cfg_aliases",
- "copyless",
- "fxhash",
- "gfx-backend-dx11",
- "gfx-backend-dx12",
- "gfx-backend-empty",
- "gfx-backend-gl",
- "gfx-backend-metal",
- "gfx-backend-vulkan",
- "gfx-hal",
- "gpu-alloc",
- "gpu-descriptor",
+ "arrayvec",
+ "bit-vec",
+ "bitflags 2.4.0",
+ "codespan-reporting",
  "log",
  "naga",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "profiling",
- "raw-window-handle 0.3.4",
- "ron 0.6.6",
+ "raw-window-handle 0.5.2",
+ "ron",
+ "rustc-hash",
  "serde",
  "smallvec",
  "thiserror",
+ "web-sys",
+ "wgpu-hal",
  "wgpu-types",
 ]
 
 [[package]]
-name = "wgpu-profiler"
-version = "0.4.0"
-source = "git+https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8#b156eb145bc223386ef344860d9b33b3c181650c"
+name = "wgpu-hal"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e30b9a8155c83868e82a8c5d3ce899de6c3961d2ef595de8fc168a1677fc2d8"
 dependencies = [
- "futures",
+ "android_system_properties",
+ "arrayvec",
+ "ash",
+ "bit-set",
+ "bitflags 2.4.0",
+ "block",
+ "core-graphics-types",
+ "d3d12",
+ "glow",
+ "glutin_wgl_sys",
+ "gpu-alloc",
+ "gpu-allocator",
+ "gpu-descriptor",
+ "hassle-rs",
+ "js-sys",
+ "khronos-egl",
+ "libc",
+ "libloading 0.8.0",
+ "log",
+ "metal",
+ "naga",
+ "objc",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle 0.5.2",
+ "renderdoc-sys",
+ "rustc-hash",
+ "smallvec",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu-types",
+ "winapi",
+]
+
+[[package]]
+name = "wgpu-profiler"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbdc78911971a06b86a57a9a8e1c861fbc90c62dcbc96bff0b2831c1e853b7bd"
+dependencies = [
+ "thiserror",
  "wgpu",
 ]
 
 [[package]]
 name = "wgpu-types"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
+ "js-sys",
  "serde",
+ "web-sys",
 ]
 
 [[package]]
@@ -8052,6 +8023,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "widestring"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -8094,18 +8071,31 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "window_clipboard"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d"
+version = "0.2.3"
+source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
 dependencies = [
  "clipboard-win 4.5.0",
- "clipboard_macos",
- "clipboard_wayland",
- "clipboard_x11",
+ "clipboard_macos 0.1.0 (git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d)",
+ "clipboard_wayland 0.2.0 (git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d)",
+ "clipboard_x11 0.4.0 (git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d)",
  "raw-window-handle 0.5.2",
  "thiserror",
 ]
 
+[[package]]
+name = "window_clipboard"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d"
+dependencies = [
+ "clipboard-win 4.5.0",
+ "clipboard_macos 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clipboard_wayland 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clipboard_x11 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "raw-window-handle 0.3.4",
+ "thiserror",
+]
+
 [[package]]
 name = "windows"
 version = "0.48.0"
@@ -8311,8 +8301,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winit"
-version = "0.28.6"
-source = "git+https://github.com/Imberflur/winit.git?tag=raw-window-handle-0.4-retro-support-v1#19a99553bc6c7298efd2438a917f2dde58ea0ea4"
+version = "0.28.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
 dependencies = [
  "android-activity",
  "bitflags 1.3.2",
@@ -8329,7 +8320,6 @@ dependencies = [
  "once_cell",
  "orbclient",
  "percent-encoding",
- "raw-window-handle 0.4.3",
  "raw-window-handle 0.5.2",
  "redox_syscall 0.3.5",
  "sctk-adwaita",
@@ -8373,15 +8363,6 @@ dependencies = [
  "toml 0.5.11",
 ]
 
-[[package]]
-name = "wio"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -8538,3 +8519,38 @@ dependencies = [
  "quote 1.0.33",
  "syn 2.0.32",
 ]
+
+[[patch.unused]]
+name = "gfx-backend-dx11"
+version = "0.8.0"
+source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
+
+[[patch.unused]]
+name = "gfx-backend-dx12"
+version = "0.8.0"
+source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
+
+[[patch.unused]]
+name = "gfx-backend-empty"
+version = "0.8.0"
+source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
+
+[[patch.unused]]
+name = "gfx-backend-gl"
+version = "0.8.1"
+source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
+
+[[patch.unused]]
+name = "gfx-backend-metal"
+version = "0.8.1"
+source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
+
+[[patch.unused]]
+name = "gfx-backend-vulkan"
+version = "0.8.0"
+source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
+
+[[patch.unused]]
+name = "gfx-hal"
+version = "0.8.0"
+source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
diff --git a/Cargo.toml b/Cargo.toml
index 4ed1120afa..8a23a9d4ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,4 @@
-cargo-features = ["named-profiles","profile-overrides"]
+cargo-features = ["named-profiles", "profile-overrides"]
 
 [workspace]
 resolver = "2"
@@ -51,13 +51,13 @@ opt-level = 3
 # this profile is used by developers if dev doesn't has enough debug information,
 # the name must != debug, as debug is used by dev because....
 [profile.debuginfo]
-inherits= 'dev'
+inherits = 'dev'
 debug = true
 
 # used to perform things that do a *lot* of math (i.e. worldgen) but still need reasonable compilation time.  Ideally this would also
 # add -C target-cpu=native, but I don't think you can set this by profile currently.
 [profile.no_overflow]
-inherits= 'dev'
+inherits = 'dev'
 overflow-checks = false
 debug-assertions = false
 
@@ -80,7 +80,7 @@ overflow-checks = false
 debug-assertions = false
 lto = true
 debug = false
-panic = "abort" # don't need unwinding so we can skip including the landing pads for that
+panic = "abort"          # don't need unwinding so we can skip including the landing pads for that
 # line tables so we can have useful backtraces for in-house crates
 [profile.release.package."veloren-network"]
 debug = 1
@@ -108,7 +108,7 @@ incremental = true
 
 # this profile is used by developers for release profiling
 [profile.releasedebuginfo]
-inherits =  'release'
+inherits = 'release'
 debug = 1
 
 [workspace.metadata.nix]
@@ -159,11 +159,6 @@ clap = { version = "4.2",  features = ["derive"]}
 
 [patch.crates-io]
 vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986c5477341bea4456be26" }
-# patch winit to support older raw-window-handle that works with old wgpu
-winit = { git = "https://github.com/Imberflur/winit.git", tag = "raw-window-handle-0.4-retro-support-v1" }
-# patch wgpu so we can use wgpu-profiler crate
-# wgpu = { git = "https://github.com/gfx-rs/wgpu.git", rev = "a92b8549a8e2cb9dac781bafc5ed32828f3caf46" }
-wgpu = { git = "https://github.com/pythonesque/wgpu.git", rev = "179ea209374a92837cde252f1d9ee01f628cae08" }
 # ntapi 3.7 fails to compile under windows due to the bug https://github.com/MSxDOS/ntapi/pull/12
 ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "9f56b149c9e25796739157c0fce3e0007a7de6eb" }
 shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" }
@@ -187,21 +182,17 @@ gfx-backend-metal = { git = "https://github.com/Imberflur/gfx.git", tag = "velor
 # gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
 # gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
 # gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
+# keyboard-keynames = { git = "https://gitlab.com/Capucho/keyboard-keynames.git", rev = "7b1375ee4ea01d0e0b80c419cb27f0498e67df3a" }
+# naga = { path = "../naga" }
 
 # # Uncomment this to use a local fork of winit (for testing purposes)
 # winit = { path = "../winit" }
 
 # # Uncomment this to use a local fork of wgpu (for testing purposes)
 # [patch.'https://github.com/gfx-rs/wgpu']
+# wgpu-hal = { path = "../wgpu/wgpu-hal" }
 # wgpu-core = { path = "../wgpu/wgpu-core" }
 # wgpu-types = { path = "../wgpu/wgpu-types" }
 
-# # Uncomment this to use a local fork of gfx-hal (for testing purposes)
-# [patch."https://github.com/gfx-rs/gfx"]
-# gfx-hal = { path = "../gfx/src/hal" }
-# gfx-backend-empty = { path = "../gfx/src/backend/empty" }
-# gfx-backend-vulkan = { path = "../gfx/src/backend/vulkan" }
-# gfx-backend-gl = { path = "../gfx/src/backend/gl" }
-# gfx-backend-dx12 = { path = "../gfx/src/backend/dx12" }
-# gfx-backend-dx11 = { path = "../gfx/src/backend/dx11" }
-# gfx-backend-metal = { path = "../gfx/src/backend/metal" }
+[patch."https://github.com/gfx-rs/naga"]
+# naga = { path = "../naga" }
diff --git a/flake.nix b/flake.nix
index 7b3cb39a3a..fea9a80e9d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -127,6 +127,8 @@
             export VELOREN_GIT_VERSION="${git.prettyRev}"
             export VELOREN_GIT_TAG="${git.tag}"
           '';
+
+          VK_ADD_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
         });
 
         nci.projects."veloren" = {
@@ -180,6 +182,8 @@
                 libxkbcommon
                 udev
                 xorg.libxcb
+
+                fontconfig
               ];
               nativeBuildInputs = with pkgs; [
                 python3
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 9463e9d783..708dba4025 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -57,9 +57,9 @@ voxygen-egui = {package = "veloren-voxygen-egui", path = "egui", optional = true
 
 # Graphics
 winit = {version = "0.28.6", features = ["serde"]}
-wgpu = { version = "=0.8.0", features = ["trace", "cross"] }
-wgpu-profiler = { git = "https://github.com/Imberflur/wgpu-profiler", tag = "wgpu-0.8" }
-bytemuck = { version="1.4", features=["derive"] }
+wgpu = { version = "=0.18.0", features = ["trace", "spirv", "glsl"] }
+wgpu-profiler = "0.15.0"
+bytemuck = { version="1.7", features=["derive"] }
 # shaderc = "0.8.0"
 # Working around a current bug in shaderc that causes it to use the system installation even if we specify compile from source
 shaderc = { git = "https://github.com/pythonesque/shaderc-rs", rev = "f2605a02062834019bedff911aee2fd2998c49f9" }
@@ -71,15 +71,16 @@ cmake = "=0.1.45"
 conrod_core = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta_0.7"}
 conrod_winit = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta_0.7"}
 euc = "0.5.0"
-iced = {package = "iced_native", git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"}
-iced_winit = {git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"}
+iced = {package = "iced_native", git = "https://github.com/JCapucho/iced", branch = "winit-updates"}
+iced_winit = {git = "https://github.com/JCapucho/iced", branch = "winit-updates"}
+window_clipboard = "0.2"
 glyph_brush = "0.7.0"
 # https://gitlab.com/Frinksy/keyboard-keynames/-/merge_requests/8
 keyboard-keynames = { git = "https://gitlab.com/Imbris/keyboard-keynames.git", tag = "veloren-winit-0.28" }
 # EGUI
-egui = {version = "0.12", optional = true }
-egui_wgpu_backend = {git = "https://github.com/hasenbanck/egui_wgpu_backend.git", rev = "63a002c6a9b6c016e45806dd065864431caab621", optional = true }
-egui_winit_platform = { git = "https://github.com/Imberflur/egui_winit_platform.git", tag = "veloren-winit-0.28", optional = true }
+egui = {version = "0.23", optional = true }
+egui_wgpu_backend = { git = "https://github.com/hasenbanck/egui_wgpu_backend.git", rev = "34691d4e9149deb9cd0bb8cbb5a56bffebf47588", optional = true }
+egui_winit_platform = { version = "0.20", optional = true }
 
 # ECS
 specs = { workspace = true, features = ["serde", "storage-event-control"] }
diff --git a/voxygen/egui/Cargo.toml b/voxygen/egui/Cargo.toml
index a301880c9d..f3a39e2a21 100644
--- a/voxygen/egui/Cargo.toml
+++ b/voxygen/egui/Cargo.toml
@@ -11,8 +11,9 @@ be-dyn-lib = []
 [dependencies]
 client = {package = "veloren-client", path = "../../client"}
 common = {package = "veloren-common", path = "../../common"}
-egui = "0.12"
-egui_winit_platform = { git = "https://github.com/Imberflur/egui_winit_platform.git", tag = "veloren-winit-0.28" }
+egui = "0.23"
+egui_plot = "0.23"
+egui_winit_platform = "0.20"
 lazy_static = { workspace = true }
 common-dynlib = {package = "veloren-common-dynlib", path = "../../common/dynlib", optional = true}
 
diff --git a/voxygen/egui/src/admin.rs b/voxygen/egui/src/admin.rs
index f2216a5c08..35c283098e 100644
--- a/voxygen/egui/src/admin.rs
+++ b/voxygen/egui/src/admin.rs
@@ -1,6 +1,6 @@
 use crate::{AdminCommandState, EguiAction, EguiActions};
 use common::cmd::ServerChatCommand;
-use egui::{CollapsingHeader, CtxRef, Resize, Slider, Ui, Vec2, Window};
+use egui::{style::Margin, CollapsingHeader, Context, Resize, Slider, Ui, Vec2, Window};
 use lazy_static::lazy_static;
 
 lazy_static! {
@@ -25,7 +25,7 @@ lazy_static! {
 }
 
 pub fn draw_admin_commands_window(
-    ctx: &CtxRef,
+    ctx: &Context,
     state: &mut AdminCommandState,
     open: &mut bool,
     egui_actions: &mut EguiActions,
@@ -69,7 +69,7 @@ fn draw_kits(ui: &mut Ui, state: &mut AdminCommandState, egui_actions: &mut Egui
 }
 
 fn draw_give_items(ui: &mut Ui, state: &mut AdminCommandState, egui_actions: &mut EguiActions) {
-    ui.spacing_mut().window_padding = Vec2::new(10.0, 10.0);
+    ui.spacing_mut().window_margin = Margin::same(10.0);
     Resize::default()
         .default_size([400.0, 200.0])
         .show(ui, |ui| {
@@ -108,7 +108,7 @@ fn draw_give_items(ui: &mut Ui, state: &mut AdminCommandState, egui_actions: &mu
         });
 }
 fn draw_spawn_entities(ui: &mut Ui, state: &mut AdminCommandState, egui_actions: &mut EguiActions) {
-    ui.spacing_mut().window_padding = Vec2::new(10.0, 10.0);
+    ui.spacing_mut().window_margin = Margin::symmetric(10.0, 10.0);
     Resize::default()
         .default_size([400.0, 200.0])
         .show(ui, |ui| {
diff --git a/voxygen/egui/src/experimental_shaders.rs b/voxygen/egui/src/experimental_shaders.rs
index 6b3d9a8730..9a703e8b4a 100644
--- a/voxygen/egui/src/experimental_shaders.rs
+++ b/voxygen/egui/src/experimental_shaders.rs
@@ -1,8 +1,8 @@
 use crate::{EguiAction, EguiActions};
-use egui::{CtxRef, Vec2, Window};
+use egui::{Context, Vec2, Window};
 
 pub fn draw_experimental_shaders_window(
-    ctx: &CtxRef,
+    ctx: &Context,
     open: &mut bool,
     egui_actions: &mut EguiActions,
     experimental_shaders: &[(String, bool)],
diff --git a/voxygen/egui/src/lib.rs b/voxygen/egui/src/lib.rs
index 895b1144ab..9ac3d7642b 100644
--- a/voxygen/egui/src/lib.rs
+++ b/voxygen/egui/src/lib.rs
@@ -19,11 +19,8 @@ use common::{
     resources::Time,
 };
 use core::mem;
-use egui::{
-    plot::{Plot, Value},
-    widgets::plot::Curve,
-    CollapsingHeader, Color32, Grid, Pos2, ScrollArea, Slider, Ui, Window,
-};
+use egui::{CollapsingHeader, Color32, Grid, Pos2, ScrollArea, Slider, Ui, Window};
+use egui_plot::{Line, Plot, PlotPoints};
 
 use crate::{
     admin::draw_admin_commands_window, character_states::draw_char_state_group,
@@ -281,13 +278,13 @@ pub fn maintain_egui_inner(
 
     Window::new("🔧 Settings")
         .open(&mut windows.egui_settings)
-        .scroll(true)
+        .vscroll(true)
         .show(ctx, |ui| {
             ctx.settings_ui(ui);
         });
     Window::new("🔍 Inspection")
         .open(&mut windows.egui_inspection)
-        .scroll(true)
+        .vscroll(true)
         .show(ctx, |ui| {
             ctx.inspection_ui(ui);
         });
@@ -304,14 +301,15 @@ pub fn maintain_egui_inner(
         .default_width(200.0)
         .default_height(200.0)
         .show(ctx, |ui| {
-            let plot = Plot::new("Frame Time").curve(Curve::from_values_iter(
-                egui_state
-                    .frame_times
-                    .iter()
-                    .enumerate()
-                    .map(|(i, x)| Value::new(i as f64, *x)),
-            ));
-            ui.add(plot);
+            Plot::new("Frame Time").show(ui, |plot_ui| {
+                plot_ui.line(Line::new(PlotPoints::from_iter(
+                    egui_state
+                        .frame_times
+                        .iter()
+                        .enumerate()
+                        .map(|(i, x)| [i as f64, *x as f64]),
+                )))
+            });
         });
 
     if windows.ecs_entities {
@@ -340,8 +338,8 @@ pub fn maintain_egui_inner(
                         .text("Cylinder height"),
                 );
 
-                let scroll_area = ScrollArea::from_max_height(800.0);
-                let (_current_scroll, _max_scroll) = scroll_area.show(ui, |ui| {
+                let scroll_area = ScrollArea::vertical().max_height(800.0);
+                scroll_area.show(ui, |ui| {
                     Grid::new("entities_grid")
                         .spacing([40.0, 4.0])
                         .max_col_width(300.0)
diff --git a/voxygen/egui/src/widgets.rs b/voxygen/egui/src/widgets.rs
index 8cde109367..d2cca65b52 100644
--- a/voxygen/egui/src/widgets.rs
+++ b/voxygen/egui/src/widgets.rs
@@ -1,4 +1,4 @@
-use egui::{Label, ScrollArea, Ui, Vec2};
+use egui::{ScrollArea, Ui, Vec2, WidgetText};
 
 pub(crate) fn filterable_list(
     ui: &mut Ui,
@@ -6,7 +6,7 @@ pub(crate) fn filterable_list(
     search_text: &str,
     selected_index: &mut usize,
 ) {
-    let scroll_area = ScrollArea::auto_sized();
+    let scroll_area = ScrollArea::vertical();
     scroll_area.show(ui, |ui| {
         ui.spacing_mut().item_spacing = Vec2::new(0.0, 2.0);
         let search_text = search_text.to_lowercase();
@@ -27,7 +27,11 @@ pub(crate) fn filterable_list(
     });
 }
 
-pub(crate) fn two_col_row(ui: &mut Ui, label: impl Into<Label>, content: impl Into<Label>) {
+pub(crate) fn two_col_row(
+    ui: &mut Ui,
+    label: impl Into<WidgetText>,
+    content: impl Into<WidgetText>,
+) {
     ui.label(label);
     ui.label(content);
     ui.end_row();
diff --git a/voxygen/src/hud/settings_window/video.rs b/voxygen/src/hud/settings_window/video.rs
index 06a004de6b..ae6dda8127 100644
--- a/voxygen/src/hud/settings_window/video.rs
+++ b/voxygen/src/hud/settings_window/video.rs
@@ -1549,7 +1549,7 @@ impl<'a> Widget for Video<'a> {
             .iter()
             .filter(
                 |mode| match self.global_state.settings.graphics.fullscreen.refresh_rate_millihertz {
-                    Some(rate) => mode.refresh_rate_millihertz() == rate,
+                    Some(refresh_rate) => mode.refresh_rate_millihertz() == refresh_rate,
                     None => true,
                 },
             )
@@ -1610,9 +1610,8 @@ impl<'a> Widget for Video<'a> {
                     None => true,
                 },
             )
-            // TODO: why do we sort by this and then map to it?
-            .sorted_by_key(|mode| mode.refresh_rate_millihertz())
             .map(|mode| mode.refresh_rate_millihertz())
+            .sorted()
             .rev()
             .dedup()
             .collect();
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index 431f411c64..42f4171e83 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -324,7 +324,8 @@ impl PlayState for CharSelectionState {
         // Bloom (does nothing if bloom is disabled)
         drawer.run_bloom_passes();
         // PostProcess and UI
-        let mut third_pass = drawer.third_pass();
+        let mut third_pass_prepared = drawer.prepare_third_pass();
+        let mut third_pass = third_pass_prepared.drawer();
         third_pass.draw_postprocess();
         // Draw the UI to the screen.
         if let Some(mut ui_drawer) = third_pass.draw_ui() {
diff --git a/voxygen/src/menu/dummy_scene.rs b/voxygen/src/menu/dummy_scene.rs
index 68d25b8f47..e3742de385 100644
--- a/voxygen/src/menu/dummy_scene.rs
+++ b/voxygen/src/menu/dummy_scene.rs
@@ -11,7 +11,7 @@ impl Scene {
     pub fn new(renderer: &mut Renderer) -> Self {
         let global_data = GlobalModel {
             globals: renderer.create_consts(&[Globals::default()]),
-            lights: renderer.create_consts(&[Light::default(); 32]),
+            lights: renderer.create_consts(&[Light::default(); 20]),
             shadows: renderer.create_consts(&[Shadow::default(); 32]),
             shadow_mats: renderer.create_shadow_bound_locals(&[ShadowLocals::default()]),
             rain_occlusion_mats: renderer
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index ae728db74d..6fc0abd4f3 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -468,7 +468,8 @@ impl PlayState for MainMenuState {
 
     fn render(&self, drawer: &mut Drawer<'_>, _: &Settings) {
         // Draw the UI to the screen.
-        let mut third_pass = drawer.third_pass();
+        let mut third_pass_prepared = drawer.prepare_third_pass();
+        let mut third_pass = third_pass_prepared.drawer();
         if let Some(mut ui_drawer) = third_pass.draw_ui() {
             self.main_menu_ui.render(&mut ui_drawer);
         };
diff --git a/voxygen/src/render/buffer.rs b/voxygen/src/render/buffer.rs
index f4d80a51cc..6089a89821 100644
--- a/voxygen/src/render/buffer.rs
+++ b/voxygen/src/render/buffer.rs
@@ -10,7 +10,7 @@ pub struct Buffer<T: Copy + Pod> {
 }
 
 impl<T: Copy + Pod> Buffer<T> {
-    pub fn new(device: &wgpu::Device, usage: wgpu::BufferUsage, data: &[T]) -> Self {
+    pub fn new(device: &wgpu::Device, usage: wgpu::BufferUsages, data: &[T]) -> Self {
         let contents = bytemuck::cast_slice(data);
 
         Self {
@@ -31,13 +31,13 @@ impl<T: Copy + Pod> Buffer<T> {
 pub struct DynamicBuffer<T: Copy + Pod>(Buffer<T>);
 
 impl<T: Copy + Pod> DynamicBuffer<T> {
-    pub fn new(device: &wgpu::Device, len: usize, usage: wgpu::BufferUsage) -> Self {
+    pub fn new(device: &wgpu::Device, len: usize, usage: wgpu::BufferUsages) -> Self {
         let buffer = Buffer {
             buf: device.create_buffer(&wgpu::BufferDescriptor {
                 label: None,
                 mapped_at_creation: false,
                 size: len as u64 * std::mem::size_of::<T>() as u64,
-                usage: usage | wgpu::BufferUsage::COPY_DST,
+                usage: usage | wgpu::BufferUsages::COPY_DST,
             }),
             len,
             phantom_data: std::marker::PhantomData,
diff --git a/voxygen/src/render/consts.rs b/voxygen/src/render/consts.rs
index 01a6161dbf..440ed77937 100644
--- a/voxygen/src/render/consts.rs
+++ b/voxygen/src/render/consts.rs
@@ -13,7 +13,7 @@ impl<T: Copy + Pod> Consts<T> {
     pub fn new(device: &wgpu::Device, len: usize) -> Self {
         Self {
             // TODO: examine if all our consts need to be updatable
-            buf: DynamicBuffer::new(device, len, wgpu::BufferUsage::UNIFORM),
+            buf: DynamicBuffer::new(device, len, wgpu::BufferUsages::UNIFORM),
         }
     }
 
diff --git a/voxygen/src/render/error.rs b/voxygen/src/render/error.rs
index d3736216c4..25c585a022 100644
--- a/voxygen/src/render/error.rs
+++ b/voxygen/src/render/error.rs
@@ -3,11 +3,12 @@
 pub enum RenderError {
     RequestDeviceError(wgpu::RequestDeviceError),
     MappingError(wgpu::BufferAsyncError),
-    SwapChainError(wgpu::SwapChainError),
+    SurfaceError(wgpu::SurfaceError),
     CustomError(String),
     CouldNotFindAdapter,
     ErrorInitializingCompiler,
     ShaderError(String, shaderc::Error),
+    ProfilerCreationError(wgpu_profiler::CreationError),
 }
 
 use std::fmt;
@@ -18,8 +19,8 @@ impl fmt::Debug for RenderError {
                 f.debug_tuple("RequestDeviceError").field(err).finish()
             },
             Self::MappingError(err) => f.debug_tuple("MappingError").field(err).finish(),
-            Self::SwapChainError(err) => f
-                .debug_tuple("SwapChainError")
+            Self::SurfaceError(err) => f
+                .debug_tuple("SurfaceError")
                 // Use Display formatting for this error since they have nice descriptions
                 .field(&format!("{}", err))
                 .finish(),
@@ -28,9 +29,9 @@ impl fmt::Debug for RenderError {
             Self::ErrorInitializingCompiler => f.debug_tuple("ErrorInitializingCompiler").finish(),
             Self::ShaderError(shader_name, err) => write!(
                 f,
-                "\"{}\" shader failed to compile due to the following error: {}",
-                shader_name, err
+                "\"{shader_name}\" shader failed to compile due to the following error: {err}",
             ),
+            RenderError::ProfilerCreationError(err) => write!(f, "Profiler creation error: {err}"),
         }
     }
 }
@@ -43,8 +44,8 @@ impl From<wgpu::BufferAsyncError> for RenderError {
     fn from(err: wgpu::BufferAsyncError) -> Self { Self::MappingError(err) }
 }
 
-impl From<wgpu::SwapChainError> for RenderError {
-    fn from(err: wgpu::SwapChainError) -> Self { Self::SwapChainError(err) }
+impl From<wgpu::SurfaceError> for RenderError {
+    fn from(err: wgpu::SurfaceError) -> Self { Self::SurfaceError(err) }
 }
 
 impl From<(&str, shaderc::Error)> for RenderError {
diff --git a/voxygen/src/render/instances.rs b/voxygen/src/render/instances.rs
index 32809755df..9141a4636d 100644
--- a/voxygen/src/render/instances.rs
+++ b/voxygen/src/render/instances.rs
@@ -31,7 +31,7 @@ impl<T: Copy + Pod> Instances<T> {
         Self {
             // TODO: examine if we have Instances that are not updated (e.g. sprites) and if there
             // would be any gains from separating those out
-            buf: DynamicBuffer::new(device, len, wgpu::BufferUsage::VERTEX),
+            buf: DynamicBuffer::new(device, len, wgpu::BufferUsages::VERTEX),
         }
     }
 
diff --git a/voxygen/src/render/model.rs b/voxygen/src/render/model.rs
index 7ba2dbb401..df8cbf5352 100644
--- a/voxygen/src/render/model.rs
+++ b/voxygen/src/render/model.rs
@@ -36,7 +36,7 @@ impl<V: Vertex> Model<V> {
         }
 
         Some(Self {
-            vbuf: Buffer::new(device, wgpu::BufferUsage::VERTEX, mesh.vertices()),
+            vbuf: Buffer::new(device, wgpu::BufferUsages::VERTEX, mesh.vertices()),
         })
     }
 
@@ -64,7 +64,7 @@ pub struct DynamicModel<V: Vertex> {
 impl<V: Vertex> DynamicModel<V> {
     pub fn new(device: &wgpu::Device, size: usize) -> Self {
         Self {
-            vbuf: DynamicBuffer::new(device, size, wgpu::BufferUsage::VERTEX),
+            vbuf: DynamicBuffer::new(device, size, wgpu::BufferUsages::VERTEX),
         }
     }
 
diff --git a/voxygen/src/render/pipelines/blit.rs b/voxygen/src/render/pipelines/blit.rs
index fc7050f9c7..feecf29332 100644
--- a/voxygen/src/render/pipelines/blit.rs
+++ b/voxygen/src/render/pipelines/blit.rs
@@ -15,7 +15,7 @@ impl BlitLayout {
                     // Color source
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Texture {
                             sample_type: wgpu::TextureSampleType::Float { filterable: true },
                             view_dimension: wgpu::TextureViewDimension::D2,
@@ -25,11 +25,8 @@ impl BlitLayout {
                     },
                     wgpu::BindGroupLayoutEntry {
                         binding: 1,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
-                        ty: wgpu::BindingType::Sampler {
-                            filtering: true,
-                            comparison: false,
-                        },
+                        visibility: wgpu::ShaderStages::FRAGMENT,
+                        ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                         count: None,
                     },
                 ],
@@ -71,7 +68,7 @@ impl BlitPipeline {
         device: &wgpu::Device,
         vs_module: &wgpu::ShaderModule,
         fs_module: &wgpu::ShaderModule,
-        sc_desc: &wgpu::SwapChainDescriptor,
+        surface_config: &wgpu::SurfaceConfiguration,
         layout: &BlitLayout,
     ) -> Self {
         common_base::span!(_guard, "BlitPipeline::new");
@@ -95,7 +92,7 @@ impl BlitPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: None,
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -108,12 +105,13 @@ impl BlitPipeline {
             fragment: Some(wgpu::FragmentState {
                 module: fs_module,
                 entry_point: "main",
-                targets: &[wgpu::ColorTargetState {
-                    format: sc_desc.format,
+                targets: &[Some(wgpu::ColorTargetState {
+                    format: surface_config.format,
                     blend: None,
-                    write_mask: wgpu::ColorWrite::ALL,
-                }],
+                    write_mask: wgpu::ColorWrites::ALL,
+                })],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/bloom.rs b/voxygen/src/render/pipelines/bloom.rs
index 6bb494059c..5f45ac7e3c 100644
--- a/voxygen/src/render/pipelines/bloom.rs
+++ b/voxygen/src/render/pipelines/bloom.rs
@@ -74,7 +74,7 @@ impl BloomLayout {
                     // Color source
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Texture {
                             sample_type: wgpu::TextureSampleType::Float { filterable: true },
                             view_dimension: wgpu::TextureViewDimension::D2,
@@ -84,17 +84,14 @@ impl BloomLayout {
                     },
                     wgpu::BindGroupLayoutEntry {
                         binding: 1,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
-                        ty: wgpu::BindingType::Sampler {
-                            filtering: true,
-                            comparison: false,
-                        },
+                        visibility: wgpu::ShaderStages::FRAGMENT,
+                        ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                         count: None,
                     },
                     // halfpixel
                     wgpu::BindGroupLayoutEntry {
                         binding: 2,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
@@ -176,7 +173,7 @@ impl BloomPipelines {
                     strip_index_format: None,
                     front_face: wgpu::FrontFace::Ccw,
                     cull_mode: None,
-                    clamp_depth: false,
+                    unclipped_depth: false,
                     polygon_mode: wgpu::PolygonMode::Fill,
                     conservative: false,
                 },
@@ -189,12 +186,13 @@ impl BloomPipelines {
                 fragment: Some(wgpu::FragmentState {
                     module: fs_module,
                     entry_point: "main",
-                    targets: &[wgpu::ColorTargetState {
+                    targets: &[Some(wgpu::ColorTargetState {
                         format: target_format,
                         blend,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    }],
+                        write_mask: wgpu::ColorWrites::ALL,
+                    })],
                 }),
+                multiview: None,
             })
         };
 
diff --git a/voxygen/src/render/pipelines/clouds.rs b/voxygen/src/render/pipelines/clouds.rs
index 498704a8b0..18685222c1 100644
--- a/voxygen/src/render/pipelines/clouds.rs
+++ b/voxygen/src/render/pipelines/clouds.rs
@@ -40,7 +40,7 @@ impl CloudsLayout {
                     // Color source
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Texture {
                             sample_type: wgpu::TextureSampleType::Float { filterable: true },
                             view_dimension: wgpu::TextureViewDimension::D2,
@@ -50,17 +50,14 @@ impl CloudsLayout {
                     },
                     wgpu::BindGroupLayoutEntry {
                         binding: 1,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
-                        ty: wgpu::BindingType::Sampler {
-                            filtering: true,
-                            comparison: false,
-                        },
+                        visibility: wgpu::ShaderStages::FRAGMENT,
+                        ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                         count: None,
                     },
                     // Depth source
                     wgpu::BindGroupLayoutEntry {
                         binding: 2,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Texture {
                             sample_type: wgpu::TextureSampleType::Float { filterable: false },
                             view_dimension: wgpu::TextureViewDimension::D2,
@@ -70,17 +67,14 @@ impl CloudsLayout {
                     },
                     wgpu::BindGroupLayoutEntry {
                         binding: 3,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
-                        ty: wgpu::BindingType::Sampler {
-                            filtering: false,
-                            comparison: false,
-                        },
+                        visibility: wgpu::ShaderStages::FRAGMENT,
+                        ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::NonFiltering),
                         count: None,
                     },
                     // Locals
                     wgpu::BindGroupLayoutEntry {
                         binding: 4,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
@@ -91,7 +85,7 @@ impl CloudsLayout {
                     // Materials source
                     wgpu::BindGroupLayoutEntry {
                         binding: 5,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Texture {
                             sample_type: wgpu::TextureSampleType::Uint,
                             view_dimension: wgpu::TextureViewDimension::D2,
@@ -161,6 +155,7 @@ impl CloudsPipeline {
         global_layout: &GlobalsLayouts,
         layout: &CloudsLayout,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "CloudsPipeline::new");
         let render_pipeline_layout =
@@ -189,7 +184,7 @@ impl CloudsPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: None,
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -202,12 +197,13 @@ impl CloudsPipeline {
             fragment: Some(wgpu::FragmentState {
                 module: fs_module,
                 entry_point: "main",
-                targets: &[wgpu::ColorTargetState {
-                    format: wgpu::TextureFormat::Rgba16Float,
+                targets: &[Some(wgpu::ColorTargetState {
+                    format,
                     blend: None,
-                    write_mask: wgpu::ColorWrite::ALL,
-                }],
+                    write_mask: wgpu::ColorWrites::ALL,
+                })],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/debug.rs b/voxygen/src/render/pipelines/debug.rs
index e97f2287aa..958df81ebb 100644
--- a/voxygen/src/render/pipelines/debug.rs
+++ b/voxygen/src/render/pipelines/debug.rs
@@ -17,7 +17,7 @@ impl Vertex {
             wgpu::vertex_attr_array![0 => Float32x3, 1 => Float32x4, 2 => Float32x3];
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &ATTRIBUTES,
         }
     }
@@ -74,6 +74,7 @@ impl DebugPipeline {
         global_layouts: &GlobalsLayouts,
         layout: &DebugLayout,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "DebugPipeline::new");
         let render_pipeline_layout =
@@ -102,7 +103,7 @@ impl DebugPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: true,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -114,7 +115,7 @@ impl DebugPipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -131,18 +132,19 @@ impl DebugPipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Rgba16Float,
+                    Some(wgpu::ColorTargetState {
+                        format,
                         blend: Some(wgpu::BlendState::ALPHA_BLENDING),
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::empty(),
-                    },
+                        write_mask: wgpu::ColorWrites::empty(),
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
@@ -162,7 +164,7 @@ impl DebugLayout {
                 label: None,
                 entries: &[wgpu::BindGroupLayoutEntry {
                     binding: 0,
-                    visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                    visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                     ty: wgpu::BindingType::Buffer {
                         ty: wgpu::BufferBindingType::Uniform,
                         has_dynamic_offset: false,
diff --git a/voxygen/src/render/pipelines/figure.rs b/voxygen/src/render/pipelines/figure.rs
index fff862dcfd..015067cba5 100644
--- a/voxygen/src/render/pipelines/figure.rs
+++ b/voxygen/src/render/pipelines/figure.rs
@@ -113,7 +113,7 @@ impl FigureLayout {
                     // locals
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
@@ -124,7 +124,7 @@ impl FigureLayout {
                     // bone data
                     wgpu::BindGroupLayoutEntry {
                         binding: 1,
-                        visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
@@ -177,6 +177,7 @@ impl FigurePipeline {
         global_layout: &GlobalsLayouts,
         layout: &FigureLayout,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "FigurePipeline::new");
         let render_pipeline_layout =
@@ -206,7 +207,7 @@ impl FigurePipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -218,7 +219,7 @@ impl FigurePipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -235,18 +236,19 @@ impl FigurePipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Rgba16Float,
+                    Some(wgpu::ColorTargetState {
+                        format,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
@@ -284,7 +286,7 @@ impl AtlasData for FigureSpriteAtlasData {
             // col lights
             wgpu::BindGroupLayoutEntry {
                 binding: 0,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -294,11 +296,8 @@ impl AtlasData for FigureSpriteAtlasData {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 1,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: true,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
         ]
diff --git a/voxygen/src/render/pipelines/fluid.rs b/voxygen/src/render/pipelines/fluid.rs
index 996968d78a..be4e07371e 100644
--- a/voxygen/src/render/pipelines/fluid.rs
+++ b/voxygen/src/render/pipelines/fluid.rs
@@ -43,7 +43,7 @@ impl Vertex {
         ];
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &ATTRIBUTES,
         }
     }
@@ -66,6 +66,7 @@ impl FluidPipeline {
         global_layout: &GlobalsLayouts,
         terrain_layout: &TerrainLayout,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "FluidPipeline::new");
         let render_pipeline_layout =
@@ -94,7 +95,7 @@ impl FluidPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: None,
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -106,7 +107,7 @@ impl FluidPipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -123,8 +124,8 @@ impl FluidPipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Rgba16Float,
+                    Some(wgpu::ColorTargetState {
+                        format,
                         blend: Some(wgpu::BlendState {
                             color: wgpu::BlendComponent {
                                 src_factor: wgpu::BlendFactor::SrcAlpha,
@@ -137,15 +138,16 @@ impl FluidPipeline {
                                 operation: wgpu::BlendOperation::Min,
                             },
                         }),
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/lod_object.rs b/voxygen/src/render/pipelines/lod_object.rs
index f73097ef6e..8a357335cf 100644
--- a/voxygen/src/render/pipelines/lod_object.rs
+++ b/voxygen/src/render/pipelines/lod_object.rs
@@ -25,7 +25,7 @@ impl Vertex {
             wgpu::vertex_attr_array![0 => Float32x3, 1 => Float32x3, 2 => Float32x3];
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &ATTRIBUTES,
         }
     }
@@ -61,7 +61,7 @@ impl Instance {
         ];
         wgpu::VertexBufferLayout {
             array_stride: mem::size_of::<Self>() as wgpu::BufferAddress,
-            step_mode: wgpu::InputStepMode::Instance,
+            step_mode: wgpu::VertexStepMode::Instance,
             attributes: &ATTRIBUTES,
         }
     }
@@ -85,6 +85,7 @@ impl LodObjectPipeline {
         fs_module: &wgpu::ShaderModule,
         global_layout: &GlobalsLayouts,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "LodObjectPipeline::new");
         let render_pipeline_layout =
@@ -109,7 +110,7 @@ impl LodObjectPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -121,7 +122,7 @@ impl LodObjectPipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -138,18 +139,19 @@ impl LodObjectPipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Rgba16Float,
+                    Some(wgpu::ColorTargetState {
+                        format,
                         blend: Some(wgpu::BlendState::REPLACE),
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/lod_terrain.rs b/voxygen/src/render/pipelines/lod_terrain.rs
index af09104365..63b218ed4c 100644
--- a/voxygen/src/render/pipelines/lod_terrain.rs
+++ b/voxygen/src/render/pipelines/lod_terrain.rs
@@ -20,7 +20,7 @@ impl Vertex {
         const ATTRIBUTES: [wgpu::VertexAttribute; 1] = wgpu::vertex_attr_array![0 => Float32x2];
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &ATTRIBUTES,
         }
     }
@@ -81,7 +81,8 @@ impl LodData {
                 sample_count: 1,
                 dimension: wgpu::TextureDimension::D2,
                 format,
-                usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST,
+                usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
+                view_formats: &[],
             };
 
             let sampler_info = wgpu::SamplerDescriptor {
@@ -147,7 +148,8 @@ impl LodData {
                 sample_count: 1,
                 dimension: wgpu::TextureDimension::D2,
                 format: wgpu::TextureFormat::Rgba8Unorm,
-                usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST,
+                usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
+                view_formats: &[],
             };
 
             let sampler_info = wgpu::SamplerDescriptor {
@@ -201,6 +203,7 @@ impl LodTerrainPipeline {
         fs_module: &wgpu::ShaderModule,
         global_layout: &GlobalsLayouts,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         let render_pipeline_layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
@@ -224,7 +227,7 @@ impl LodTerrainPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -236,7 +239,7 @@ impl LodTerrainPipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -253,18 +256,19 @@ impl LodTerrainPipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Rgba16Float,
+                    Some(wgpu::ColorTargetState {
+                        format,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/mod.rs b/voxygen/src/render/pipelines/mod.rs
index 86e9531146..aaa676f560 100644
--- a/voxygen/src/render/pipelines/mod.rs
+++ b/voxygen/src/render/pipelines/mod.rs
@@ -383,7 +383,8 @@ pub trait AtlasData {
                 sample_count: 1,
                 dimension: wgpu::TextureDimension::D2,
                 format: fmt,
-                usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST,
+                usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
+                view_formats: &[],
             };
 
             let sampler_info = wgpu::SamplerDescriptor {
@@ -420,7 +421,7 @@ impl GlobalsLayouts {
             // Global uniform
             wgpu::BindGroupLayoutEntry {
                 binding: 0,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Buffer {
                     ty: wgpu::BufferBindingType::Uniform,
                     has_dynamic_offset: false,
@@ -431,7 +432,7 @@ impl GlobalsLayouts {
             // Noise tex
             wgpu::BindGroupLayoutEntry {
                 binding: 1,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -441,17 +442,14 @@ impl GlobalsLayouts {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 2,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: true,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
             // Light uniform
             wgpu::BindGroupLayoutEntry {
                 binding: 3,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Buffer {
                     ty: wgpu::BufferBindingType::Uniform,
                     has_dynamic_offset: false,
@@ -462,7 +460,7 @@ impl GlobalsLayouts {
             // Shadow uniform
             wgpu::BindGroupLayoutEntry {
                 binding: 4,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Buffer {
                     ty: wgpu::BufferBindingType::Uniform,
                     has_dynamic_offset: false,
@@ -473,7 +471,7 @@ impl GlobalsLayouts {
             // Alt texture
             wgpu::BindGroupLayoutEntry {
                 binding: 5,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -483,17 +481,14 @@ impl GlobalsLayouts {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 6,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: true,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
             // Horizon texture
             wgpu::BindGroupLayoutEntry {
                 binding: 7,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -503,17 +498,14 @@ impl GlobalsLayouts {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 8,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: true,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
             // light shadows (ie shadows from a light?)
             wgpu::BindGroupLayoutEntry {
                 binding: 9,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 // TODO: is this relevant?
                 ty: wgpu::BindingType::Buffer {
                     ty: wgpu::BufferBindingType::Uniform,
@@ -525,7 +517,7 @@ impl GlobalsLayouts {
             // lod map (t_map)
             wgpu::BindGroupLayoutEntry {
                 binding: 10,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -535,17 +527,14 @@ impl GlobalsLayouts {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 11,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: true,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
             // clouds t_weather
             wgpu::BindGroupLayoutEntry {
                 binding: 12,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -555,17 +544,14 @@ impl GlobalsLayouts {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 13,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: true,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
             // rain occlusion
             wgpu::BindGroupLayoutEntry {
                 binding: 14,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
                 ty: wgpu::BindingType::Buffer {
                     ty: wgpu::BufferBindingType::Uniform,
                     has_dynamic_offset: false,
@@ -588,7 +574,7 @@ impl GlobalsLayouts {
                 // point shadow_maps
                 wgpu::BindGroupLayoutEntry {
                     binding: 0,
-                    visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                    visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                     ty: wgpu::BindingType::Texture {
                         sample_type: wgpu::TextureSampleType::Depth,
                         view_dimension: wgpu::TextureViewDimension::Cube,
@@ -598,17 +584,14 @@ impl GlobalsLayouts {
                 },
                 wgpu::BindGroupLayoutEntry {
                     binding: 1,
-                    visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                    ty: wgpu::BindingType::Sampler {
-                        filtering: true,
-                        comparison: true,
-                    },
+                    visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
+                    ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Comparison),
                     count: None,
                 },
                 // directed shadow maps
                 wgpu::BindGroupLayoutEntry {
                     binding: 2,
-                    visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                    visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                     ty: wgpu::BindingType::Texture {
                         sample_type: wgpu::TextureSampleType::Depth,
                         view_dimension: wgpu::TextureViewDimension::D2,
@@ -618,17 +601,14 @@ impl GlobalsLayouts {
                 },
                 wgpu::BindGroupLayoutEntry {
                     binding: 3,
-                    visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                    ty: wgpu::BindingType::Sampler {
-                        filtering: true,
-                        comparison: true,
-                    },
+                    visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
+                    ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Comparison),
                     count: None,
                 },
                 // Rain occlusion maps
                 wgpu::BindGroupLayoutEntry {
                     binding: 4,
-                    visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                    visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
                     ty: wgpu::BindingType::Texture {
                         sample_type: wgpu::TextureSampleType::Depth,
                         view_dimension: wgpu::TextureViewDimension::D2,
@@ -638,11 +618,8 @@ impl GlobalsLayouts {
                 },
                 wgpu::BindGroupLayoutEntry {
                     binding: 5,
-                    visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                    ty: wgpu::BindingType::Sampler {
-                        filtering: true,
-                        comparison: true,
-                    },
+                    visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                    ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Comparison),
                     count: None,
                 },
             ],
diff --git a/voxygen/src/render/pipelines/particle.rs b/voxygen/src/render/pipelines/particle.rs
index f8d8d0242e..34a156c755 100644
--- a/voxygen/src/render/pipelines/particle.rs
+++ b/voxygen/src/render/pipelines/particle.rs
@@ -38,7 +38,7 @@ impl Vertex {
             wgpu::vertex_attr_array![0 => Float32x3, 1 => Uint32];
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &ATTRIBUTES,
         }
     }
@@ -190,7 +190,7 @@ impl Instance {
         const ATTRIBUTES: [wgpu::VertexAttribute; 6] = wgpu::vertex_attr_array![2 => Float32, 3 => Float32, 4 => Float32, 5 => Sint32, 6 => Float32x3, 7 => Float32x3];
         wgpu::VertexBufferLayout {
             array_stride: mem::size_of::<Self>() as wgpu::BufferAddress,
-            step_mode: wgpu::InputStepMode::Instance,
+            step_mode: wgpu::VertexStepMode::Instance,
             attributes: &ATTRIBUTES,
         }
     }
@@ -211,6 +211,7 @@ impl ParticlePipeline {
         fs_module: &wgpu::ShaderModule,
         global_layout: &GlobalsLayouts,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "ParticlePipeline::new");
         let render_pipeline_layout =
@@ -235,7 +236,7 @@ impl ParticlePipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -247,7 +248,7 @@ impl ParticlePipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -264,9 +265,8 @@ impl ParticlePipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
-                        // TODO: use a constant and/or pass in this format on pipeline construction
-                        format: wgpu::TextureFormat::Rgba16Float,
+                    Some(wgpu::ColorTargetState {
+                        format,
                         blend: Some(wgpu::BlendState {
                             color: wgpu::BlendComponent {
                                 src_factor: wgpu::BlendFactor::SrcAlpha,
@@ -279,15 +279,16 @@ impl ParticlePipeline {
                                 operation: wgpu::BlendOperation::Add,
                             },
                         }),
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/postprocess.rs b/voxygen/src/render/pipelines/postprocess.rs
index edac5c3516..cf66d7fbf3 100644
--- a/voxygen/src/render/pipelines/postprocess.rs
+++ b/voxygen/src/render/pipelines/postprocess.rs
@@ -37,7 +37,7 @@ impl PostProcessLayout {
             // src color
             wgpu::BindGroupLayoutEntry {
                 binding: 0,
-                visibility: wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -47,17 +47,14 @@ impl PostProcessLayout {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 1,
-                visibility: wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: true,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
             // Depth source
             wgpu::BindGroupLayoutEntry {
                 binding: 2,
-                visibility: wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: false },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -67,17 +64,14 @@ impl PostProcessLayout {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 3,
-                visibility: wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: false,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::NonFiltering),
                 count: None,
             },
             // Locals
             wgpu::BindGroupLayoutEntry {
                 binding: 4,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Buffer {
                     ty: wgpu::BufferBindingType::Uniform,
                     has_dynamic_offset: false,
@@ -93,7 +87,7 @@ impl PostProcessLayout {
                 // src bloom
                 wgpu::BindGroupLayoutEntry {
                     binding,
-                    visibility: wgpu::ShaderStage::FRAGMENT,
+                    visibility: wgpu::ShaderStages::FRAGMENT,
                     ty: wgpu::BindingType::Texture {
                         sample_type: wgpu::TextureSampleType::Float { filterable: true },
                         view_dimension: wgpu::TextureViewDimension::D2,
@@ -111,7 +105,7 @@ impl PostProcessLayout {
             // Material source
             bind_entries.push(wgpu::BindGroupLayoutEntry {
                 binding,
-                visibility: wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Uint,
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -204,7 +198,7 @@ impl PostProcessPipeline {
         device: &wgpu::Device,
         vs_module: &wgpu::ShaderModule,
         fs_module: &wgpu::ShaderModule,
-        sc_desc: &wgpu::SwapChainDescriptor,
+        surface_config: &wgpu::SurfaceConfiguration,
         global_layout: &GlobalsLayouts,
         layout: &PostProcessLayout,
     ) -> Self {
@@ -229,7 +223,7 @@ impl PostProcessPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: None,
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -242,12 +236,13 @@ impl PostProcessPipeline {
             fragment: Some(wgpu::FragmentState {
                 module: fs_module,
                 entry_point: "main",
-                targets: &[wgpu::ColorTargetState {
-                    format: sc_desc.format,
+                targets: &[Some(wgpu::ColorTargetState {
+                    format: surface_config.format,
                     blend: None,
-                    write_mask: wgpu::ColorWrite::ALL,
-                }],
+                    write_mask: wgpu::ColorWrites::ALL,
+                })],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/rain_occlusion.rs b/voxygen/src/render/pipelines/rain_occlusion.rs
index 18a2cea9ea..ed2bde4f20 100644
--- a/voxygen/src/render/pipelines/rain_occlusion.rs
+++ b/voxygen/src/render/pipelines/rain_occlusion.rs
@@ -53,7 +53,7 @@ impl RainOcclusionLayout {
                 label: None,
                 entries: &[wgpu::BindGroupLayoutEntry {
                     binding: 0,
-                    visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                    visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
                     ty: wgpu::BindingType::Buffer {
                         ty: wgpu::BufferBindingType::Uniform,
                         has_dynamic_offset: false,
@@ -118,7 +118,7 @@ impl RainOcclusionFigurePipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: true,
+                unclipped_depth: true,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -129,8 +129,8 @@ impl RainOcclusionFigurePipeline {
                 stencil: wgpu::StencilState {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
-                    read_mask: !0,
-                    write_mask: !0,
+                    read_mask: 0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -144,6 +144,7 @@ impl RainOcclusionFigurePipeline {
                 alpha_to_coverage_enabled: false,
             },
             fragment: None,
+            multiview: None,
         });
 
         Self {
@@ -186,7 +187,7 @@ impl RainOcclusionPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: None,
-                clamp_depth: true,
+                unclipped_depth: true,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -197,8 +198,8 @@ impl RainOcclusionPipeline {
                 stencil: wgpu::StencilState {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
-                    read_mask: !0,
-                    write_mask: !0,
+                    read_mask: 0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -212,6 +213,7 @@ impl RainOcclusionPipeline {
                 alpha_to_coverage_enabled: false,
             },
             fragment: None,
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/rope.rs b/voxygen/src/render/pipelines/rope.rs
index 3e488f4a7e..1777ebf174 100644
--- a/voxygen/src/render/pipelines/rope.rs
+++ b/voxygen/src/render/pipelines/rope.rs
@@ -47,7 +47,7 @@ impl Vertex {
             wgpu::vertex_attr_array![0 => Float32x3, 1 => Float32x3];
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &ATTRIBUTES,
         }
     }
@@ -71,7 +71,7 @@ impl RopeLayout {
                     // locals
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
@@ -141,7 +141,7 @@ impl RopePipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -170,7 +170,7 @@ impl RopePipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
+                    Some(wgpu::ColorTargetState {
                         // TODO: use a constant and/or pass in this format on pipeline construction
                         format: wgpu::TextureFormat::Rgba16Float,
                         blend: Some(wgpu::BlendState {
@@ -185,15 +185,16 @@ impl RopePipeline {
                                 operation: wgpu::BlendOperation::Add,
                             },
                         }),
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/shadow.rs b/voxygen/src/render/pipelines/shadow.rs
index 913e57ed7c..cc98fb41f4 100644
--- a/voxygen/src/render/pipelines/shadow.rs
+++ b/voxygen/src/render/pipelines/shadow.rs
@@ -38,7 +38,7 @@ impl ShadowLayout {
                 label: None,
                 entries: &[wgpu::BindGroupLayoutEntry {
                     binding: 0,
-                    visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                    visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                     ty: wgpu::BindingType::Buffer {
                         ty: wgpu::BufferBindingType::Uniform,
                         has_dynamic_offset: false,
@@ -115,7 +115,7 @@ impl ShadowFigurePipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Front),
-                clamp_depth: true,
+                unclipped_depth: true,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -127,7 +127,7 @@ impl ShadowFigurePipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -141,6 +141,7 @@ impl ShadowFigurePipeline {
                 alpha_to_coverage_enabled: false,
             },
             fragment: None,
+            multiview: None,
         });
 
         Self {
@@ -183,7 +184,7 @@ impl ShadowPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Front),
-                clamp_depth: true,
+                unclipped_depth: true,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -195,7 +196,7 @@ impl ShadowPipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -209,6 +210,7 @@ impl ShadowPipeline {
                 alpha_to_coverage_enabled: false,
             },
             fragment: None,
+            multiview: None,
         });
 
         Self {
@@ -232,7 +234,7 @@ impl PointShadowPipeline {
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 label: Some("Point shadow pipeline layout"),
                 push_constant_ranges: &[wgpu::PushConstantRange {
-                    stages: wgpu::ShaderStage::all(),
+                    stages: wgpu::ShaderStages::all(),
                     range: 0..64,
                 }],
                 bind_group_layouts: &[&global_layout.globals, &terrain_layout.locals],
@@ -253,7 +255,7 @@ impl PointShadowPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -265,7 +267,7 @@ impl PointShadowPipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -279,6 +281,7 @@ impl PointShadowPipeline {
                 alpha_to_coverage_enabled: false,
             },
             fragment: None,
+            multiview: None,
         });
 
         Self {
@@ -321,7 +324,7 @@ impl ShadowDebugPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Front),
-                clamp_depth: true,
+                unclipped_depth: true,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -347,6 +350,7 @@ impl ShadowDebugPipeline {
                 alpha_to_coverage_enabled: false,
             },
             fragment: None,
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/skybox.rs b/voxygen/src/render/pipelines/skybox.rs
index 78c5610ee0..7da94e6419 100644
--- a/voxygen/src/render/pipelines/skybox.rs
+++ b/voxygen/src/render/pipelines/skybox.rs
@@ -12,7 +12,7 @@ impl Vertex {
     fn desc<'a>() -> wgpu::VertexBufferLayout<'a> {
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &[wgpu::VertexAttribute {
                 offset: 0,
                 shader_location: 0,
@@ -39,6 +39,7 @@ impl SkyboxPipeline {
         fs_module: &wgpu::ShaderModule,
         layouts: &GlobalsLayouts,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "SkyboxPipeline::new");
         let render_pipeline_layout =
@@ -63,7 +64,7 @@ impl SkyboxPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -75,7 +76,7 @@ impl SkyboxPipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -92,8 +93,8 @@ impl SkyboxPipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Rgba16Float,
+                    Some(wgpu::ColorTargetState {
+                        format,
                         blend: Some(wgpu::BlendState {
                             color: wgpu::BlendComponent::REPLACE,
                             alpha: wgpu::BlendComponent {
@@ -102,15 +103,16 @@ impl SkyboxPipeline {
                                 operation: wgpu::BlendOperation::Add,
                             },
                         }),
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/sprite.rs b/voxygen/src/render/pipelines/sprite.rs
index c811be6673..cea472376c 100644
--- a/voxygen/src/render/pipelines/sprite.rs
+++ b/voxygen/src/render/pipelines/sprite.rs
@@ -86,7 +86,7 @@ pub(in super::super) fn create_verts_buffer(
     // TODO: type Buffer by wgpu::BufferUsage
     SpriteVerts(Buffer::new(
         device,
-        wgpu::BufferUsage::STORAGE,
+        wgpu::BufferUsages::STORAGE,
         mesh.vertices(),
     ))
 }
@@ -154,7 +154,7 @@ impl Instance {
         ];
         wgpu::VertexBufferLayout {
             array_stride: mem::size_of::<Self>() as wgpu::BufferAddress,
-            step_mode: wgpu::InputStepMode::Instance,
+            step_mode: wgpu::VertexStepMode::Instance,
             attributes: &ATTRIBUTES,
         }
     }
@@ -195,7 +195,7 @@ impl SpriteLayout {
             // sprite_verts
             wgpu::BindGroupLayoutEntry {
                 binding: 15,
-                visibility: wgpu::ShaderStage::VERTEX,
+                visibility: wgpu::ShaderStages::VERTEX,
                 ty: wgpu::BindingType::Buffer {
                     ty: wgpu::BufferBindingType::Storage { read_only: true },
                     has_dynamic_offset: false,
@@ -266,6 +266,7 @@ impl SpritePipeline {
         layout: &SpriteLayout,
         terrain_layout: &TerrainLayout,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "SpritePipeline::new");
         let render_pipeline_layout =
@@ -296,7 +297,7 @@ impl SpritePipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -308,7 +309,7 @@ impl SpritePipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -325,8 +326,8 @@ impl SpritePipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Rgba16Float,
+                    Some(wgpu::ColorTargetState {
+                        format,
                         // TODO: can we remove sprite transparency?
                         blend: Some(wgpu::BlendState {
                             color: wgpu::BlendComponent {
@@ -340,15 +341,16 @@ impl SpritePipeline {
                                 operation: wgpu::BlendOperation::Add,
                             },
                         }),
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/terrain.rs b/voxygen/src/render/pipelines/terrain.rs
index 30c7cb5c64..e713aada1f 100644
--- a/voxygen/src/render/pipelines/terrain.rs
+++ b/voxygen/src/render/pipelines/terrain.rs
@@ -123,7 +123,7 @@ impl Vertex {
             wgpu::vertex_attr_array![0 => Uint32,1 => Uint32];
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &ATTRIBUTES,
         }
     }
@@ -189,7 +189,7 @@ impl TerrainLayout {
                     // locals
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
@@ -231,6 +231,7 @@ impl TerrainPipeline {
         global_layout: &GlobalsLayouts,
         layout: &TerrainLayout,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "TerrainPipeline::new");
         let render_pipeline_layout =
@@ -260,7 +261,7 @@ impl TerrainPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -272,7 +273,7 @@ impl TerrainPipeline {
                     front: wgpu::StencilFaceState::IGNORE,
                     back: wgpu::StencilFaceState::IGNORE,
                     read_mask: !0,
-                    write_mask: !0,
+                    write_mask: 0,
                 },
                 bias: wgpu::DepthBiasState {
                     constant: 0,
@@ -289,18 +290,19 @@ impl TerrainPipeline {
                 module: fs_module,
                 entry_point: "main",
                 targets: &[
-                    wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Rgba16Float,
+                    Some(wgpu::ColorTargetState {
+                        format,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
-                    wgpu::ColorTargetState {
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
+                    Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Rgba8Uint,
                         blend: None,
-                        write_mask: wgpu::ColorWrite::ALL,
-                    },
+                        write_mask: wgpu::ColorWrites::ALL,
+                    }),
                 ],
             }),
+            multiview: None,
         });
 
         Self {
@@ -343,7 +345,7 @@ impl AtlasData for TerrainAtlasData {
             // col lights
             wgpu::BindGroupLayoutEntry {
                 binding: 0,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -353,17 +355,14 @@ impl AtlasData for TerrainAtlasData {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 1,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: true,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
             // kind
             wgpu::BindGroupLayoutEntry {
                 binding: 2,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Uint,
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -373,11 +372,8 @@ impl AtlasData for TerrainAtlasData {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 3,
-                visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                ty: wgpu::BindingType::Sampler {
-                    filtering: false,
-                    comparison: false,
-                },
+                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::NonFiltering),
                 count: None,
             },
         ]
diff --git a/voxygen/src/render/pipelines/trail.rs b/voxygen/src/render/pipelines/trail.rs
index 77e2cffdab..896c5c66a1 100644
--- a/voxygen/src/render/pipelines/trail.rs
+++ b/voxygen/src/render/pipelines/trail.rs
@@ -16,7 +16,7 @@ impl Vertex {
         const ATTRIBUTES: [wgpu::VertexAttribute; 1] = wgpu::vertex_attr_array![0 => Float32x3];
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &ATTRIBUTES,
         }
     }
@@ -64,6 +64,7 @@ impl TrailPipeline {
         fs_module: &wgpu::ShaderModule,
         global_layout: &GlobalsLayouts,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "TrailPipeline::new");
         let render_pipeline_layout =
@@ -88,7 +89,7 @@ impl TrailPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: None,
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -116,9 +117,8 @@ impl TrailPipeline {
             fragment: Some(wgpu::FragmentState {
                 module: fs_module,
                 entry_point: "main",
-                targets: &[wgpu::ColorTargetState {
-                    // TODO: use a constant and/or pass in this format on pipeline construction
-                    format: wgpu::TextureFormat::Rgba16Float,
+                targets: &[Some(wgpu::ColorTargetState {
+                    format,
                     blend: Some(wgpu::BlendState {
                         color: wgpu::BlendComponent {
                             src_factor: wgpu::BlendFactor::SrcAlpha,
@@ -131,9 +131,10 @@ impl TrailPipeline {
                             operation: wgpu::BlendOperation::Add,
                         },
                     }),
-                    write_mask: wgpu::ColorWrite::ALL,
-                }],
+                    write_mask: wgpu::ColorWrites::ALL,
+                })],
             }),
+            multiview: None,
         });
 
         Self {
diff --git a/voxygen/src/render/pipelines/ui.rs b/voxygen/src/render/pipelines/ui.rs
index da00de4555..edbd86972e 100644
--- a/voxygen/src/render/pipelines/ui.rs
+++ b/voxygen/src/render/pipelines/ui.rs
@@ -1,6 +1,5 @@
 use super::super::{Bound, Consts, GlobalsLayouts, Quad, Texture, Tri, Vertex as VertexTrait};
 use bytemuck::{Pod, Zeroable};
-use core::num::NonZeroU32;
 use std::mem;
 use vek::*;
 
@@ -34,7 +33,7 @@ impl Vertex {
         ];
         wgpu::VertexBufferLayout {
             array_stride: Self::STRIDE,
-            step_mode: wgpu::InputStepMode::Vertex,
+            step_mode: wgpu::VertexStepMode::Vertex,
             attributes: &ATTRIBUTES,
         }
     }
@@ -156,7 +155,7 @@ impl UiLayout {
                     // locals
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
@@ -172,7 +171,7 @@ impl UiLayout {
                     // texture
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                         ty: wgpu::BindingType::Texture {
                             sample_type: wgpu::TextureSampleType::Float { filterable: true },
                             view_dimension: wgpu::TextureViewDimension::D2,
@@ -182,17 +181,14 @@ impl UiLayout {
                     },
                     wgpu::BindGroupLayoutEntry {
                         binding: 1,
-                        visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
-                        ty: wgpu::BindingType::Sampler {
-                            filtering: true,
-                            comparison: false,
-                        },
+                        visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
+                        ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                         count: None,
                     },
                     // tex_locals
                     wgpu::BindGroupLayoutEntry {
                         binding: 2,
-                        visibility: wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
@@ -259,7 +255,7 @@ impl UiPipeline {
         device: &wgpu::Device,
         vs_module: &wgpu::ShaderModule,
         fs_module: &wgpu::ShaderModule,
-        sc_desc: &wgpu::SwapChainDescriptor,
+        surface_config: &wgpu::SurfaceConfiguration,
         global_layout: &GlobalsLayouts,
         layout: &UiLayout,
     ) -> Self {
@@ -283,7 +279,7 @@ impl UiPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -296,8 +292,8 @@ impl UiPipeline {
             fragment: Some(wgpu::FragmentState {
                 module: fs_module,
                 entry_point: "main",
-                targets: &[wgpu::ColorTargetState {
-                    format: sc_desc.format,
+                targets: &[Some(wgpu::ColorTargetState {
+                    format: surface_config.format,
                     blend: Some(wgpu::BlendState {
                         color: wgpu::BlendComponent {
                             src_factor: wgpu::BlendFactor::SrcAlpha,
@@ -310,9 +306,10 @@ impl UiPipeline {
                             operation: wgpu::BlendOperation::Add,
                         },
                     }),
-                    write_mask: wgpu::ColorWrite::ALL,
-                }],
+                    write_mask: wgpu::ColorWrites::ALL,
+                })],
             }),
+            multiview: None,
         });
 
         Self {
@@ -463,7 +460,7 @@ impl PremultiplyAlphaLayout {
                     // source_texture
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStage::FRAGMENT,
+                        visibility: wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Texture {
                             sample_type: wgpu::TextureSampleType::Float { filterable: false },
                             view_dimension: wgpu::TextureViewDimension::D2,
@@ -492,7 +489,7 @@ impl PremultiplyAlphaPipeline {
             label: Some("Premultiply alpha pipeline layout"),
             bind_group_layouts: &[&layout.source_texture],
             push_constant_ranges: &[wgpu::PushConstantRange {
-                stages: wgpu::ShaderStage::VERTEX,
+                stages: wgpu::ShaderStages::VERTEX,
                 range: 0..core::mem::size_of::<PremultiplyAlphaParams>() as u32,
             }],
         });
@@ -510,7 +507,7 @@ impl PremultiplyAlphaPipeline {
                 strip_index_format: None,
                 front_face: wgpu::FrontFace::Ccw,
                 cull_mode: Some(wgpu::Face::Back),
-                clamp_depth: false,
+                unclipped_depth: false,
                 polygon_mode: wgpu::PolygonMode::Fill,
                 conservative: false,
             },
@@ -519,12 +516,13 @@ impl PremultiplyAlphaPipeline {
             fragment: Some(wgpu::FragmentState {
                 module: fs_module,
                 entry_point: "main",
-                targets: &[wgpu::ColorTargetState {
+                targets: &[Some(wgpu::ColorTargetState {
                     format: UI_IMAGE_FORMAT,
                     blend: None,
-                    write_mask: wgpu::ColorWrite::ALL,
-                }],
+                    write_mask: wgpu::ColorWrites::ALL,
+                })],
             }),
+            multiview: None,
         });
 
         Self { pipeline }
@@ -584,19 +582,21 @@ impl PremultiplyUpload {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
-            usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST,
+            usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
+            view_formats: &[],
         });
         queue.write_texture(
             wgpu::ImageCopyTexture {
                 texture: &source_tex,
                 mip_level: 0,
                 origin: wgpu::Origin3d::ZERO,
+                aspect: wgpu::TextureAspect::All,
             },
             &(&**image)[..(image.width() as usize * image.height() as usize * 4)],
             wgpu::ImageDataLayout {
                 offset: 0,
-                bytes_per_row: NonZeroU32::new(image.width() * 4),
-                rows_per_image: NonZeroU32::new(image.height()),
+                bytes_per_row: Some(image.width() * 4),
+                rows_per_image: Some(image.height()),
             },
             image_size,
         );
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index 7cec6c479f..1c538f7289 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -34,8 +34,6 @@ use super::{
 use common::assets::{self, AssetExt, AssetHandle, ReloadWatcher};
 use common_base::span;
 use core::convert::TryFrom;
-#[cfg(feature = "egui-ui")]
-use egui_wgpu_backend::wgpu::TextureFormat;
 use std::sync::Arc;
 use tracing::{error, info, warn};
 use vek::*;
@@ -138,8 +136,7 @@ pub struct Renderer {
     device: Arc<wgpu::Device>,
     queue: wgpu::Queue,
     surface: wgpu::Surface,
-    swap_chain: wgpu::SwapChain,
-    sc_desc: wgpu::SwapChainDescriptor,
+    surface_config: wgpu::SurfaceConfiguration,
 
     sampler: wgpu::Sampler,
     depth_sampler: wgpu::Sampler,
@@ -184,6 +181,9 @@ pub struct Renderer {
 
     // To remember the backend info after initialization for debug purposes
     graphics_backend: String,
+
+    /// The texture format used for the intermediate rendering passes
+    intermediate_format: wgpu::TextureFormat,
 }
 
 impl Renderer {
@@ -204,34 +204,39 @@ impl Renderer {
 
         // TODO: fix panic on wayland with opengl?
         // TODO: fix backend defaulting to opengl on wayland.
-        let backend_bit = std::env::var("WGPU_BACKEND")
+        let backends = std::env::var("WGPU_BACKEND")
             .ok()
             .and_then(|backend| match backend.to_lowercase().as_str() {
-                "vulkan" => Some(wgpu::BackendBit::VULKAN),
-                "metal" => Some(wgpu::BackendBit::METAL),
-                "dx12" => Some(wgpu::BackendBit::DX12),
-                "primary" => Some(wgpu::BackendBit::PRIMARY),
-                "opengl" | "gl" => Some(wgpu::BackendBit::GL),
-                "dx11" => Some(wgpu::BackendBit::DX11),
-                "secondary" => Some(wgpu::BackendBit::SECONDARY),
-                "all" => Some(wgpu::BackendBit::all()),
+                "vulkan" => Some(wgpu::Backends::VULKAN),
+                "metal" => Some(wgpu::Backends::METAL),
+                "dx12" => Some(wgpu::Backends::DX12),
+                "primary" => Some(wgpu::Backends::PRIMARY),
+                "opengl" | "gl" => Some(wgpu::Backends::GL),
+                "dx11" => Some(wgpu::Backends::DX11),
+                "secondary" => Some(wgpu::Backends::SECONDARY),
+                "all" => Some(wgpu::Backends::all()),
                 _ => None,
             })
-            .unwrap_or(
-                (wgpu::BackendBit::PRIMARY | wgpu::BackendBit::SECONDARY) & !wgpu::BackendBit::GL,
-            );
+            .unwrap_or(wgpu::Backends::PRIMARY | wgpu::Backends::SECONDARY);
 
-        let instance = wgpu::Instance::new(backend_bit);
+        let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
+            backends,
+            dx12_shader_compiler: wgpu::Dx12Compiler::Fxc,
+            gles_minor_version: wgpu::Gles3MinorVersion::Automatic,
+            // TODO: Look into what we want here.
+            flags: wgpu::InstanceFlags::all(),
+        });
 
         let dims = window.inner_size();
 
         // This is unsafe because the window handle must be valid, if you find a way to
         // have an invalid winit::Window then you have bigger issues
         #[allow(unsafe_code)]
-        let surface = unsafe { instance.create_surface(window) };
+        let surface =
+            unsafe { instance.create_surface(window) }.expect("Failed to create a surface");
 
         let adapters = instance
-            .enumerate_adapters(backend_bit)
+            .enumerate_adapters(backends)
             .enumerate()
             .collect::<Vec<_>>();
 
@@ -259,6 +264,7 @@ impl Renderer {
                 runtime.block_on(instance.request_adapter(&wgpu::RequestAdapterOptionsBase {
                     power_preference: wgpu::PowerPreference::HighPerformance,
                     compatible_surface: Some(&surface),
+                    force_fallback_adapter: false,
                 }))
             },
         }
@@ -310,10 +316,10 @@ impl Renderer {
             &wgpu::DeviceDescriptor {
                 // TODO
                 label: None,
-                features: wgpu::Features::DEPTH_CLAMPING
+                features: wgpu::Features::DEPTH_CLIP_CONTROL
                     | wgpu::Features::ADDRESS_MODE_CLAMP_TO_BORDER
                     | wgpu::Features::PUSH_CONSTANTS
-                    | (adapter.features() & wgpu_profiler::GpuProfiler::REQUIRED_WGPU_FEATURES),
+                    | (adapter.features() & wgpu_profiler::GpuProfiler::ALL_WGPU_TIMER_FEATURES),
                 limits,
             },
             trace_path,
@@ -322,17 +328,17 @@ impl Renderer {
         // Set error handler for wgpu errors
         // This is better for use than their default because it includes the error in
         // the panic message
-        device.on_uncaptured_error(move |error| {
+        device.on_uncaptured_error(Box::new(move |error| {
             error!("{}", &error);
             panic!(
                 "wgpu error (handling all wgpu errors as fatal):\n{:?}\n{:?}",
                 &error, &info,
             );
-        });
+        }));
 
         let profiler_features_enabled = device
             .features()
-            .contains(wgpu_profiler::GpuProfiler::REQUIRED_WGPU_FEATURES);
+            .intersects(wgpu_profiler::GpuProfiler::ALL_WGPU_TIMER_FEATURES);
         if !profiler_features_enabled {
             info!(
                 "The features for GPU profiling (timestamp queries) are not available on this \
@@ -340,20 +346,52 @@ impl Renderer {
             );
         }
 
-        let format = adapter
-            .get_swap_chain_preferred_format(&surface)
-            .expect("No supported swap chain format found");
-        info!("Using {:?} as the swapchain format", format);
+        let surface_capabilities = surface.get_capabilities(&adapter);
+        let format = surface_capabilities.formats[0];
+        info!("Using {:?} as the surface format", format);
 
-        let sc_desc = wgpu::SwapChainDescriptor {
-            usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
+        let surface_config = wgpu::SurfaceConfiguration {
+            usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
             format,
             width: dims.width,
             height: dims.height,
             present_mode: other_modes.present_mode.into(),
+            alpha_mode: wgpu::CompositeAlphaMode::Opaque,
+            view_formats: Vec::new(),
         };
 
-        let swap_chain = device.create_swap_chain(&surface, &sc_desc);
+        let supported_internal_formats = [wgpu::TextureFormat::Rgba16Float, format];
+        let intermediate_format = supported_internal_formats
+            .into_iter()
+            .find(|format| {
+                use wgpu::TextureUsages as Usages;
+                use wgpu::TextureFormatFeatureFlags as Flags;
+                use super::AaMode;
+
+                let features = adapter
+                    .get_texture_format_features(*format);
+
+                let usage_ok = features
+                    .allowed_usages
+                    .contains(Usages::RENDER_ATTACHMENT | Usages::COPY_SRC | Usages::TEXTURE_BINDING);
+
+                let msaa_flags = match pipeline_modes.aa {
+                    AaMode::None | AaMode::Fxaa | AaMode::Hqx | AaMode::FxUpscale | AaMode::Bilinear => Flags::empty(),
+                    AaMode::MsaaX4 => Flags::MULTISAMPLE_X4,
+                    AaMode::MsaaX8 => Flags::MULTISAMPLE_X8,
+                    AaMode::MsaaX16 => Flags::MULTISAMPLE_X8, // TODO?
+                };
+
+                let flags_ok = features.flags.contains(Flags::FILTERABLE | msaa_flags);
+
+                usage_ok && flags_ok
+            })
+            // This should be unreachable as the surface format should always support the
+            // needed capabilities
+            .expect("No supported intermediate format");
+        info!("Using {:?} as the intermediate format", intermediate_format);
+
+        surface.configure(&device, &surface_config);
 
         let shadow_views = ShadowMap::create_shadow_views(
             &device,
@@ -429,8 +467,9 @@ impl Renderer {
             },
             shaders.cloned(),
             pipeline_modes.clone(),
-            sc_desc.clone(), // Note: cheap clone
+            surface_config.clone(), // Note: cheap clone
             shadow_views.is_some(),
+            intermediate_format,
         )?;
 
         let state = State::Interface {
@@ -445,6 +484,7 @@ impl Renderer {
             (dims.width, dims.height),
             &pipeline_modes,
             &other_modes,
+            intermediate_format,
         );
 
         let create_sampler = |filter| {
@@ -501,21 +541,22 @@ impl Renderer {
             create_quad_index_buffer_u16(&device, QUAD_INDEX_BUFFER_U16_START_VERT_LEN as usize);
         let quad_index_buffer_u32 =
             create_quad_index_buffer_u32(&device, QUAD_INDEX_BUFFER_U32_START_VERT_LEN as usize);
-        let mut profiler = wgpu_profiler::GpuProfiler::new(4, queue.get_timestamp_period());
         other_modes.profiler_enabled &= profiler_features_enabled;
-        profiler.enable_timer = other_modes.profiler_enabled;
-        profiler.enable_debug_marker = other_modes.profiler_enabled;
+        let profiler = wgpu_profiler::GpuProfiler::new(wgpu_profiler::GpuProfilerSettings {
+            enable_timer_scopes: other_modes.profiler_enabled,
+            enable_debug_groups: other_modes.profiler_enabled,
+            max_num_pending_frames: 4,
+        })
+        .map_err(RenderError::ProfilerCreationError)?;
 
         #[cfg(feature = "egui-ui")]
-        let egui_renderpass =
-            egui_wgpu_backend::RenderPass::new(&device, TextureFormat::Bgra8UnormSrgb, 1);
+        let egui_renderpass = egui_wgpu_backend::RenderPass::new(&*device, format, 1);
 
         Ok(Self {
             device,
             queue,
             surface,
-            swap_chain,
-            sc_desc,
+            surface_config,
 
             state,
             recreation_pending: None,
@@ -552,6 +593,8 @@ impl Renderer {
             is_minimized: false,
 
             graphics_backend,
+
+            intermediate_format,
         })
     }
 
@@ -588,7 +631,7 @@ impl Renderer {
             self.other_modes = other_modes;
 
             // Update present mode in swap chain descriptor
-            self.sc_desc.present_mode = self.other_modes.present_mode.into();
+            self.surface_config.present_mode = self.other_modes.present_mode.into();
 
             // Only enable profiling if the wgpu features are enabled
             self.other_modes.profiler_enabled &= self.profiler_features_enabled;
@@ -597,8 +640,17 @@ impl Renderer {
                 // Clear the times if disabled
                 core::mem::take(&mut self.profile_times);
             }
-            self.profiler.enable_timer = self.other_modes.profiler_enabled;
-            self.profiler.enable_debug_marker = self.other_modes.profiler_enabled;
+            self.profiler
+                .change_settings(wgpu_profiler::GpuProfilerSettings {
+                    enable_timer_scopes: self.other_modes.profiler_enabled,
+                    enable_debug_groups: self.other_modes.profiler_enabled,
+                    max_num_pending_frames: 4,
+                })
+                .map_err(|err| {
+                    RenderError::ProfilerCreationError(
+                        wgpu_profiler::CreationError::InvalidSettings(err),
+                    )
+                })?;
 
             // Recreate render target
             self.on_resize(self.resolution);
@@ -657,9 +709,9 @@ impl Renderer {
             self.is_minimized = false;
             // Resize swap chain
             self.resolution = dims;
-            self.sc_desc.width = dims.x;
-            self.sc_desc.height = dims.y;
-            self.swap_chain = self.device.create_swap_chain(&self.surface, &self.sc_desc);
+            self.surface_config.width = dims.x;
+            self.surface_config.height = dims.y;
+            self.surface.configure(&self.device, &self.surface_config);
 
             // Resize other render targets
             let (views, bloom_sizes) = Self::create_rt_views(
@@ -667,6 +719,7 @@ impl Renderer {
                 (dims.x, dims.y),
                 &self.pipeline_modes,
                 &self.other_modes,
+                self.intermediate_format,
             );
             self.views = views;
 
@@ -792,7 +845,7 @@ impl Renderer {
             self.queue.submit(std::iter::empty());
         }
 
-        self.device.poll(wgpu::Maintain::Poll)
+        self.device.poll(wgpu::Maintain::Poll);
     }
 
     /// Create render target views
@@ -801,6 +854,7 @@ impl Renderer {
         size: (u32, u32),
         pipeline_modes: &PipelineModes,
         other_modes: &OtherModes,
+        format: wgpu::TextureFormat,
     ) -> (Views, [Vec2<f32>; bloom::NUM_SIZES]) {
         let upscaled = Vec2::<u32>::from(size)
             .map(|e| (e as f32 * other_modes.upscale_mode.factor) as u32)
@@ -821,7 +875,9 @@ impl Renderer {
                 sample_count,
                 dimension: wgpu::TextureDimension::D2,
                 format,
-                usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::RENDER_ATTACHMENT,
+                usage: wgpu::TextureUsages::TEXTURE_BINDING
+                    | wgpu::TextureUsages::RENDER_ATTACHMENT,
+                view_formats: &[],
             });
 
             tex.create_view(&wgpu::TextureViewDescriptor {
@@ -837,8 +893,8 @@ impl Renderer {
             })
         };
 
-        let tgt_color_view = color_view(width, height, wgpu::TextureFormat::Rgba16Float);
-        let tgt_color_pp_view = color_view(width, height, wgpu::TextureFormat::Rgba16Float);
+        let tgt_color_view = color_view(width, height, format);
+        let tgt_color_pp_view = color_view(width, height, format);
 
         let tgt_mat_view = color_view(width, height, wgpu::TextureFormat::Rgba8Uint);
 
@@ -851,9 +907,10 @@ impl Renderer {
             size
         });
 
-        let bloom_tgt_views = pipeline_modes.bloom.is_on().then(|| {
-            bloom_sizes.map(|size| color_view(size.x, size.y, wgpu::TextureFormat::Rgba16Float))
-        });
+        let bloom_tgt_views = pipeline_modes
+            .bloom
+            .is_on()
+            .then(|| bloom_sizes.map(|size| color_view(size.x, size.y, format)));
 
         let tgt_depth_tex = device.create_texture(&wgpu::TextureDescriptor {
             label: None,
@@ -866,7 +923,8 @@ impl Renderer {
             sample_count,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Depth32Float,
-            usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::RENDER_ATTACHMENT,
+            usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::RENDER_ATTACHMENT,
+            view_formats: &[],
         });
         let tgt_depth_view = tgt_depth_tex.create_view(&wgpu::TextureViewDescriptor {
             label: None,
@@ -890,7 +948,8 @@ impl Renderer {
             sample_count,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Depth32Float,
-            usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
+            usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
+            view_formats: &[],
         });
         // TODO: Consider no depth buffer for the final draw to the window?
         let win_depth_view = win_depth_tex.create_view(&wgpu::TextureViewDescriptor {
@@ -990,7 +1049,8 @@ impl Renderer {
         // Try to get the latest profiling results
         if self.other_modes.profiler_enabled {
             // Note: this lags a few frames behind
-            if let Some(profile_times) = self.profiler.process_finished_frame() {
+            let timestamp_period = self.queue.get_timestamp_period();
+            if let Some(profile_times) = self.profiler.process_finished_frame(timestamp_period) {
                 self.profile_times = profile_times;
             }
         }
@@ -1168,26 +1228,26 @@ impl Renderer {
             }
         }
 
-        let tex = match self.swap_chain.get_current_frame() {
-            Ok(frame) => frame.output,
+        let texture = match self.surface.get_current_texture() {
+            Ok(texture) => texture,
             // If lost recreate the swap chain
-            Err(err @ wgpu::SwapChainError::Lost) => {
+            Err(err @ wgpu::SurfaceError::Lost) => {
                 warn!("{}. Recreating swap chain. A frame will be missed", err);
                 self.on_resize(self.resolution);
                 return Ok(None);
             },
-            Err(wgpu::SwapChainError::Timeout) => {
+            Err(wgpu::SurfaceError::Timeout) => {
                 // This will probably be resolved on the next frame
                 // NOTE: we don't log this because it happens very frequently with
                 // PresentMode::Fifo and unlimited FPS on certain machines
                 return Ok(None);
             },
-            Err(err @ wgpu::SwapChainError::Outdated) => {
+            Err(err @ wgpu::SurfaceError::Outdated) => {
                 warn!("{}. Recreating the swapchain", err);
-                self.swap_chain = self.device.create_swap_chain(&self.surface, &self.sc_desc);
+                self.surface.configure(&self.device, &self.surface_config);
                 return Ok(None);
             },
-            Err(err @ wgpu::SwapChainError::OutOfMemory) => return Err(err.into()),
+            Err(err @ wgpu::SurfaceError::OutOfMemory) => return Err(err.into()),
         };
         let encoder = self
             .device
@@ -1195,7 +1255,7 @@ impl Renderer {
                 label: Some("A render encoder"),
             });
 
-        Ok(Some(drawer::Drawer::new(encoder, self, tex, globals)))
+        Ok(Some(drawer::Drawer::new(encoder, self, texture, globals)))
     }
 
     /// Recreate the pipelines
@@ -1220,8 +1280,9 @@ impl Renderer {
                         // needs to become a part of the pipeline modes
                         // (note here since the present mode is accessible
                         // through the swap chain descriptor)
-                        self.sc_desc.clone(), // Note: cheap clone
+                        self.surface_config.clone(), // Note: cheap clone
                         shadow.map.is_enabled(),
+                        self.intermediate_format,
                     ),
                 ));
             },
@@ -1340,11 +1401,8 @@ impl Renderer {
     /// Return the maximum supported texture size.
     pub fn max_texture_size(&self) -> u32 { Self::max_texture_size_raw(&self.device) }
 
-    /// Return the maximum supported texture size from the factory.
-    fn max_texture_size_raw(_device: &wgpu::Device) -> u32 {
-        // This value is temporary as there are plans to include a way to get this in
-        // wgpu this is just a sane standard for now
-        8192
+    fn max_texture_size_raw(device: &wgpu::Device) -> u32 {
+        device.limits().max_texture_dimension_2d
     }
 
     /// Create a new immutable texture from the provided image.
@@ -1361,7 +1419,7 @@ impl Renderer {
         let tex = Texture::new_raw(&self.device, texture_info, view_info, sampler_info);
 
         let size = texture_info.size;
-        let block_size = texture_info.format.describe().block_size;
+        let block_size = texture_info.format.block_size(None).unwrap();
         assert_eq!(
             size.width as usize
                 * size.height as usize
@@ -1536,7 +1594,7 @@ fn create_quad_index_buffer_u16(device: &wgpu::Device, vert_length: usize) -> Bu
         .map(|(i, b)| (i / 6 * 4 + b) as u16)
         .collect::<Vec<_>>();
 
-    Buffer::new(device, wgpu::BufferUsage::INDEX, &indices)
+    Buffer::new(device, wgpu::BufferUsages::INDEX, &indices)
 }
 
 fn create_quad_index_buffer_u32(device: &wgpu::Device, vert_length: usize) -> Buffer<u32> {
@@ -1550,7 +1608,7 @@ fn create_quad_index_buffer_u32(device: &wgpu::Device, vert_length: usize) -> Bu
         .map(|(i, b)| (i / 6 * 4 + b) as u32)
         .collect::<Vec<_>>();
 
-    Buffer::new(device, wgpu::BufferUsage::INDEX, &indices)
+    Buffer::new(device, wgpu::BufferUsages::INDEX, &indices)
 }
 
 /// Terrain-related buffers segment themselves by depth to allow us to do
diff --git a/voxygen/src/render/renderer/drawer.rs b/voxygen/src/render/renderer/drawer.rs
index c7fbb0bc89..6d6fc9445e 100644
--- a/voxygen/src/render/renderer/drawer.rs
+++ b/voxygen/src/render/renderer/drawer.rs
@@ -16,7 +16,7 @@ use super::{
     Renderer, ShadowMap, ShadowMapRenderer,
 };
 use common_base::prof_span;
-use core::{num::NonZeroU32, ops::Range};
+use core::ops::Range;
 use std::sync::Arc;
 use vek::Aabr;
 use wgpu_profiler::scope::{ManualOwningScope, OwningScope, Scope};
@@ -73,7 +73,7 @@ struct RendererBorrow<'frame> {
     queue: &'frame wgpu::Queue,
     device: &'frame wgpu::Device,
     #[cfg(feature = "egui-ui")]
-    sc_desc: &'frame wgpu::SwapChainDescriptor,
+    surface_config: &'frame wgpu::SurfaceConfiguration,
     shadow: Option<&'frame super::Shadow>,
     pipelines: Pipelines<'frame>,
     locals: &'frame super::locals::Locals,
@@ -89,7 +89,7 @@ struct RendererBorrow<'frame> {
 pub struct Drawer<'frame> {
     encoder: Option<ManualOwningScope<'frame, wgpu::CommandEncoder>>,
     borrow: RendererBorrow<'frame>,
-    swap_tex: wgpu::SwapChainTexture,
+    surface_texture: Option<wgpu::SurfaceTexture>,
     globals: &'frame GlobalsBindGroup,
     // Texture and other info for taking a screenshot
     // Writes to this instead in the third pass if it is present
@@ -100,7 +100,7 @@ impl<'frame> Drawer<'frame> {
     pub fn new(
         encoder: wgpu::CommandEncoder,
         renderer: &'frame mut Renderer,
-        swap_tex: wgpu::SwapChainTexture,
+        surface_texture: wgpu::SurfaceTexture,
         globals: &'frame GlobalsBindGroup,
     ) -> Self {
         let taking_screenshot = renderer.take_screenshot.take().map(|screenshot_fn| {
@@ -108,7 +108,7 @@ impl<'frame> Drawer<'frame> {
                 &renderer.device,
                 &renderer.layouts.blit,
                 &renderer.sampler,
-                &renderer.sc_desc,
+                &renderer.surface_config,
                 screenshot_fn,
             )
         });
@@ -125,7 +125,7 @@ impl<'frame> Drawer<'frame> {
             queue: &renderer.queue,
             device: &renderer.device,
             #[cfg(feature = "egui-ui")]
-            sc_desc: &renderer.sc_desc,
+            surface_config: &renderer.surface_config,
             shadow,
             pipelines,
             locals: &renderer.locals,
@@ -144,7 +144,7 @@ impl<'frame> Drawer<'frame> {
         Self {
             encoder: Some(encoder),
             borrow,
-            swap_tex,
+            surface_texture: Some(surface_texture),
             globals,
             taking_screenshot,
         }
@@ -174,10 +174,12 @@ impl<'frame> Drawer<'frame> {
                         view: &rain_occlusion_renderer.depth.view,
                         depth_ops: Some(wgpu::Operations {
                             load: wgpu::LoadOp::Clear(1.0),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         }),
                         stencil_ops: None,
                     }),
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 },
             );
 
@@ -211,10 +213,12 @@ impl<'frame> Drawer<'frame> {
                         view: &shadow_renderer.directed_depth.view,
                         depth_ops: Some(wgpu::Operations {
                             load: wgpu::LoadOp::Clear(1.0),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         }),
                         stencil_ops: None,
                     }),
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 });
 
             render_pass.set_bind_group(0, &self.globals.bind_group, &[]);
@@ -242,31 +246,33 @@ impl<'frame> Drawer<'frame> {
             encoder.scoped_render_pass("first_pass", device, &wgpu::RenderPassDescriptor {
                 label: Some("first pass"),
                 color_attachments: &[
-                    wgpu::RenderPassColorAttachment {
+                    Some(wgpu::RenderPassColorAttachment {
                         view: &self.borrow.views.tgt_color,
                         resolve_target: None,
                         ops: wgpu::Operations {
                             load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         },
-                    },
-                    wgpu::RenderPassColorAttachment {
+                    }),
+                    Some(wgpu::RenderPassColorAttachment {
                         view: &self.borrow.views.tgt_mat,
                         resolve_target: None,
                         ops: wgpu::Operations {
                             load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         },
-                    },
+                    }),
                 ],
                 depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment {
                     view: &self.borrow.views.tgt_depth,
                     depth_ops: Some(wgpu::Operations {
                         load: wgpu::LoadOp::Clear(0.0),
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     }),
                     stencil_ops: None,
                 }),
+                timestamp_writes: None,
+                occlusion_query_set: None,
             });
 
         render_pass.set_bind_group(0, &self.globals.bind_group, &[]);
@@ -290,15 +296,17 @@ impl<'frame> Drawer<'frame> {
         let mut render_pass =
             encoder.scoped_render_pass("volumetric_pass", device, &wgpu::RenderPassDescriptor {
                 label: Some("volumetric pass (clouds)"),
-                color_attachments: &[wgpu::RenderPassColorAttachment {
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: &self.borrow.views.tgt_color_pp,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     },
-                }],
+                })],
                 depth_stencil_attachment: None,
+                timestamp_writes: None,
+                occlusion_query_set: None,
             });
 
         render_pass.set_bind_group(0, &self.globals.bind_group, &[]);
@@ -321,22 +329,24 @@ impl<'frame> Drawer<'frame> {
         let mut render_pass =
             encoder.scoped_render_pass("transparent_pass", device, &wgpu::RenderPassDescriptor {
                 label: Some("transparent pass (trails)"),
-                color_attachments: &[wgpu::RenderPassColorAttachment {
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: &self.borrow.views.tgt_color_pp,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Load,
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     },
-                }],
+                })],
                 depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment {
                     view: &self.borrow.views.tgt_depth,
                     depth_ops: Some(wgpu::Operations {
                         load: wgpu::LoadOp::Load,
-                        store: false,
+                        store: wgpu::StoreOp::Discard,
                     }),
                     stencil_ops: None,
                 }),
+                timestamp_writes: None,
+                occlusion_query_set: None,
             });
 
         render_pass.set_bind_group(0, &self.globals.bind_group, &[]);
@@ -377,12 +387,17 @@ impl<'frame> Drawer<'frame> {
             let mut render_pass =
                 encoder.scoped_render_pass(&label, device, &wgpu::RenderPassDescriptor {
                     label: Some(&pass_label),
-                    color_attachments: &[wgpu::RenderPassColorAttachment {
+                    color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                         resolve_target: None,
                         view,
-                        ops: wgpu::Operations { store: true, load },
-                    }],
+                        ops: wgpu::Operations {
+                            store: wgpu::StoreOp::Store,
+                            load,
+                        },
+                    })],
                     depth_stencil_attachment: None,
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 });
 
             render_pass.set_bind_group(0, bind, &[]);
@@ -460,83 +475,69 @@ impl<'frame> Drawer<'frame> {
             let mut render_pass =
                 encoder.scoped_render_pass(&profile_name, device, &wgpu::RenderPassDescriptor {
                     label: Some(&label),
-                    color_attachments: &[wgpu::RenderPassColorAttachment {
+                    color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                         view: &target_texture.view,
                         resolve_target: None,
                         ops: wgpu::Operations {
                             load: wgpu::LoadOp::Load,
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         },
-                    }],
+                    })],
                     depth_stencil_attachment: None,
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 });
             render_pass.set_pipeline(&premultiply_alpha.pipeline);
             for upload in &uploads {
                 let (source_bind_group, push_constant_data) = upload.draw_data(&target_texture);
                 let bytes = bytemuck::bytes_of(&push_constant_data);
                 render_pass.set_bind_group(0, source_bind_group, &[]);
-                render_pass.set_push_constants(wgpu::ShaderStage::VERTEX, 0, bytes);
+                render_pass.set_push_constants(wgpu::ShaderStages::VERTEX, 0, bytes);
                 render_pass.draw(0..6, 0..1);
             }
         }
     }
 
+    /// Prepares the third pass drawer to be used.
+    ///
     /// Note, this automatically calls the internal `run_ui_premultiply_passes`
     /// to complete any pending image uploads for the UI.
-    pub fn third_pass(&mut self) -> ThirdPassDrawer {
+    pub fn prepare_third_pass(&mut self) -> ThirdPassDrawerPrepared<'_, 'frame> {
         self.run_ui_premultiply_passes();
 
-        let encoder = self.encoder.as_mut().unwrap();
-        let device = self.borrow.device;
-        let mut render_pass =
-            encoder.scoped_render_pass("third_pass", device, &wgpu::RenderPassDescriptor {
-                label: Some("third pass (postprocess + ui)"),
-                color_attachments: &[wgpu::RenderPassColorAttachment {
-                    // If a screenshot was requested render to that as an intermediate texture
-                    // instead
-                    view: self
-                        .taking_screenshot
-                        .as_ref()
-                        .map_or(&self.swap_tex.view, |s| s.texture_view()),
-                    resolve_target: None,
-                    ops: wgpu::Operations {
-                        load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                        store: true,
-                    },
-                }],
-                depth_stencil_attachment: None,
-            });
+        // Create a view to the surface texture.
+        let view = self.surface_texture.as_ref().unwrap().texture.create_view(
+            &wgpu::TextureViewDescriptor {
+                label: Some("Surface texture view"),
+                ..Default::default()
+            },
+        );
 
-        render_pass.set_bind_group(0, &self.globals.bind_group, &[]);
-
-        ThirdPassDrawer {
-            render_pass,
-            borrow: &self.borrow,
-        }
+        ThirdPassDrawerPrepared { view, drawer: self }
     }
 
     #[cfg(feature = "egui-ui")]
     pub fn draw_egui(&mut self, platform: &mut Platform, scale_factor: f32) {
         span!(guard, "Draw egui");
 
-        let (_output, paint_commands) = platform.end_frame();
+        let output = platform.end_frame(None);
 
-        let paint_jobs = platform.context().tessellate(paint_commands);
+        let paint_jobs = platform.context().tessellate(output.shapes);
 
         let screen_descriptor = ScreenDescriptor {
-            physical_width: self.borrow.sc_desc.width,
-            physical_height: self.borrow.sc_desc.height,
+            physical_width: self.borrow.surface_config.width,
+            physical_height: self.borrow.surface_config.height,
             scale_factor,
         };
 
-        self.borrow.egui_render_pass.update_texture(
-            self.borrow.device,
-            self.borrow.queue,
-            &platform.context().texture(),
-        );
         self.borrow
             .egui_render_pass
-            .update_user_textures(self.borrow.device, self.borrow.queue);
+            .add_textures(
+                self.borrow.device,
+                self.borrow.queue,
+                &output.textures_delta,
+            )
+            .expect("Failed to update egui textures");
         self.borrow.egui_render_pass.update_buffers(
             self.borrow.device,
             self.borrow.queue,
@@ -544,16 +545,31 @@ impl<'frame> Drawer<'frame> {
             &screen_descriptor,
         );
 
-        self.borrow.egui_render_pass.execute(
-            self.encoder.as_mut().unwrap(),
-            self.taking_screenshot
-                .as_ref()
-                .map_or(&self.swap_tex.view, |s| s.texture_view()),
-            &paint_jobs,
-            &screen_descriptor,
-            None,
+        let view = self.surface_texture.as_ref().unwrap().texture.create_view(
+            &wgpu::TextureViewDescriptor {
+                label: Some("Surface texture view"),
+                ..Default::default()
+            },
         );
 
+        self.borrow
+            .egui_render_pass
+            .execute(
+                self.encoder.as_mut().unwrap(),
+                self.taking_screenshot
+                    .as_ref()
+                    .map_or(&view, |s| s.texture_view()),
+                &paint_jobs,
+                &screen_descriptor,
+                None,
+            )
+            .expect("Failed to draw egui");
+
+        self.borrow
+            .egui_render_pass
+            .remove_textures(output.textures_delta)
+            .expect("Failed to remove unused egui textures");
+
         drop(guard);
     }
 
@@ -593,7 +609,7 @@ impl<'frame> Drawer<'frame> {
                             base_mip_level: 0,
                             mip_level_count: None,
                             base_array_layer: face,
-                            array_layer_count: NonZeroU32::new(1),
+                            array_layer_count: Some(1),
                         });
 
                 let label = format!("point shadow face-{} pass", face);
@@ -605,10 +621,12 @@ impl<'frame> Drawer<'frame> {
                             view: &view,
                             depth_ops: Some(wgpu::Operations {
                                 load: wgpu::LoadOp::Clear(1.0),
-                                store: true,
+                                store: wgpu::StoreOp::Store,
                             }),
                             stencil_ops: None,
                         }),
+                        timestamp_writes: None,
+                        occlusion_query_set: None,
                     });
 
                 render_pass.set_pipeline(&shadow_renderer.point_pipeline.pipeline);
@@ -617,7 +635,7 @@ impl<'frame> Drawer<'frame> {
 
                 (0../*20*/1).for_each(|point_light| {
                     render_pass.set_push_constants(
-                        wgpu::ShaderStage::all(),
+                        wgpu::ShaderStages::all(),
                         0,
                         &data[(6 * (point_light + 1) * STRIDE + face as usize * STRIDE)
                             ..(6 * (point_light + 1) * STRIDE + (face + 1) as usize * STRIDE)],
@@ -656,10 +674,12 @@ impl<'frame> Drawer<'frame> {
                         view: &shadow_renderer.directed_depth.view,
                         depth_ops: Some(wgpu::Operations {
                             load: wgpu::LoadOp::Clear(1.0),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         }),
                         stencil_ops: None,
                     }),
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 },
             );
 
@@ -677,7 +697,7 @@ impl<'frame> Drawer<'frame> {
                             base_mip_level: 0,
                             mip_level_count: None,
                             base_array_layer: face,
-                            array_layer_count: NonZeroU32::new(1),
+                            array_layer_count: Some(1),
                         });
 
                 let label = format!("clear point shadow face-{} pass", face);
@@ -688,10 +708,12 @@ impl<'frame> Drawer<'frame> {
                         view: &view,
                         depth_ops: Some(wgpu::Operations {
                             load: wgpu::LoadOp::Clear(1.0),
-                            store: true,
+                            store: wgpu::StoreOp::Store,
                         }),
                         stencil_ops: None,
                     }),
+                    timestamp_writes: None,
+                    occlusion_query_set: None,
                 });
             }
         }
@@ -710,21 +732,30 @@ impl<'frame> Drop for Drawer<'frame> {
             .take()
             .zip(self.borrow.pipelines.blit())
             .map(|(screenshot, blit)| {
+                let view = self.surface_texture.as_ref().unwrap().texture.create_view(
+                    &wgpu::TextureViewDescriptor {
+                        label: Some("Surface texture view"),
+                        ..Default::default()
+                    },
+                );
+
                 // Image needs to be copied from the screenshot texture to the swapchain texture
                 let mut render_pass = encoder.scoped_render_pass(
                     "screenshot blit",
                     self.borrow.device,
                     &wgpu::RenderPassDescriptor {
                         label: Some("Blit screenshot pass"),
-                        color_attachments: &[wgpu::RenderPassColorAttachment {
-                            view: &self.swap_tex.view,
+                        color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                            view: &view,
                             resolve_target: None,
                             ops: wgpu::Operations {
                                 load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                                store: true,
+                                store: wgpu::StoreOp::Store,
                             },
-                        }],
+                        })],
                         depth_stencil_attachment: None,
+                        timestamp_writes: None,
+                        occlusion_query_set: None,
                     },
                 );
                 render_pass.set_pipeline(&blit.pipeline);
@@ -747,6 +778,7 @@ impl<'frame> Drop for Drawer<'frame> {
         if let Some(f) = download_and_handle_screenshot {
             f();
         }
+        self.surface_texture.take().unwrap().present();
 
         profiler
             .end_frame()
@@ -1280,6 +1312,49 @@ impl<'pass_ref, 'pass: 'pass_ref> TrailDrawer<'pass_ref, 'pass> {
     }
 }
 
+/// Third pass drawer intermediate representation in order to store
+/// the surface texture view (in case it's used).
+pub struct ThirdPassDrawerPrepared<'pass, 'drawer> {
+    /// The texture view to render to.
+    view: wgpu::TextureView,
+    drawer: &'pass mut Drawer<'drawer>,
+}
+
+impl<'pass, 'drawer> ThirdPassDrawerPrepared<'pass, 'drawer> {
+    pub fn drawer(&mut self) -> ThirdPassDrawer {
+        let encoder = self.drawer.encoder.as_mut().unwrap();
+        let device = self.drawer.borrow.device;
+        let mut render_pass =
+            encoder.scoped_render_pass("third_pass", device, &wgpu::RenderPassDescriptor {
+                label: Some("third pass (postprocess + ui)"),
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                    // If a screenshot was requested render to that as an intermediate texture
+                    // instead
+                    view: self
+                        .drawer
+                        .taking_screenshot
+                        .as_ref()
+                        .map_or(&self.view, |s| s.texture_view()),
+                    resolve_target: None,
+                    ops: wgpu::Operations {
+                        load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
+                        store: wgpu::StoreOp::Store,
+                    },
+                })],
+                depth_stencil_attachment: None,
+                timestamp_writes: None,
+                occlusion_query_set: None,
+            });
+
+        render_pass.set_bind_group(0, &self.drawer.globals.bind_group, &[]);
+
+        ThirdPassDrawer {
+            render_pass,
+            borrow: &self.drawer.borrow,
+        }
+    }
+}
+
 /// Third pass: postprocess + ui
 #[must_use]
 pub struct ThirdPassDrawer<'pass> {
diff --git a/voxygen/src/render/renderer/pipeline_creation.rs b/voxygen/src/render/renderer/pipeline_creation.rs
index c7a21f5a26..680cc272a2 100644
--- a/voxygen/src/render/renderer/pipeline_creation.rs
+++ b/voxygen/src/render/renderer/pipeline_creation.rs
@@ -14,7 +14,6 @@ use super::{
 };
 use common_base::{prof_span, prof_span_alloc};
 use std::sync::Arc;
-use tracing::warn;
 
 /// All the pipelines
 pub struct Pipelines {
@@ -283,8 +282,9 @@ impl ShaderModules {
 
         let mut compiler = Compiler::new().ok_or(RenderError::ErrorInitializingCompiler)?;
         let mut options = CompileOptions::new().ok_or(RenderError::ErrorInitializingCompiler)?;
-        options.set_optimization_level(OptimizationLevel::Performance);
+        options.set_optimization_level(OptimizationLevel::Zero);
         options.set_forced_version_profile(430, shaderc::GlslProfile::Core);
+        // options.set_generate_debug_info();
         options.set_include_callback(move |name, _, shader_name, _| {
             Ok(ResolvedInclude {
                 resolved_name: name.to_string(),
@@ -409,20 +409,27 @@ fn create_shader_module(
         .compile_into_spirv(source, kind, file_name, "main", Some(options))
         .map_err(|e| (file_name, e))?;
 
-    if spv.get_num_warnings() > 0 {
-        warn!(
-            "shaderc emitted compilation warnings for {file_name}:\n\n{}",
-            spv.get_warning_messages()
-        );
-    }
+    // Uncomment me to dump shaders to files
+    //
+    // std::fs::create_dir_all("dumpped-shaders").expect("Couldn't create shader
+    // dumps folders");
+    //
+    // let mut file = std::fs::File::create(format!("dumpped-shaders/{}.spv",
+    // file_name))     .expect("Couldn't open shader out");
+    //
+    // use std::io::Write;
+    //
+    // file.write(spv.as_binary_u8())
+    //     .expect("Couldn't write shader out");
 
-    let label = [file_name, "\n\n", source].concat();
-    Ok(device.create_shader_module(&wgpu::ShaderModuleDescriptor {
-        label: Some(&label),
-        source: wgpu::ShaderSource::SpirV(Cow::Borrowed(spv.as_binary())),
-        flags: wgpu::ShaderFlags::empty(),
-        // TODO: renable // flags: wgpu::ShaderFlags::VALIDATION,
-    }))
+    // let label = [file_name, "\n\n", source].concat();
+    #[allow(unsafe_code)]
+    Ok(unsafe {
+        device.create_shader_module_unchecked(wgpu::ShaderModuleDescriptor {
+            label: Some(file_name),
+            source: wgpu::ShaderSource::SpirV(Cow::Borrowed(spv.as_binary())),
+        })
+    })
 }
 
 /// Things needed to create a pipeline
@@ -432,7 +439,7 @@ struct PipelineNeeds<'a> {
     layouts: &'a Layouts,
     shaders: &'a ShaderModules,
     pipeline_modes: &'a PipelineModes,
-    sc_desc: &'a wgpu::SwapChainDescriptor,
+    surface_config: &'a wgpu::SurfaceConfiguration,
 }
 
 /// Creates InterfacePipelines in parallel
@@ -452,7 +459,7 @@ fn create_interface_pipelines(
                     needs.device,
                     &needs.shaders.ui_vert,
                     &needs.shaders.ui_frag,
-                    needs.sc_desc,
+                    needs.surface_config,
                     &needs.layouts.global,
                     &needs.layouts.ui,
                 )
@@ -483,7 +490,7 @@ fn create_interface_pipelines(
                     needs.device,
                     &needs.shaders.blit_vert,
                     &needs.shaders.blit_frag,
-                    needs.sc_desc,
+                    needs.surface_config,
                     &needs.layouts.blit,
                 )
             },
@@ -508,6 +515,7 @@ fn create_ingame_and_shadow_pipelines(
     pool: &rayon::ThreadPool,
     // TODO: Reduce the boilerplate in this file
     tasks: [Task; 20],
+    format: wgpu::TextureFormat,
 ) -> IngameAndShadowPipelines {
     prof_span!(_guard, "create_ingame_and_shadow_pipelines");
 
@@ -516,7 +524,7 @@ fn create_ingame_and_shadow_pipelines(
         layouts,
         shaders,
         pipeline_modes,
-        sc_desc,
+        surface_config: sc_desc,
     } = needs;
 
     let [
@@ -558,6 +566,7 @@ fn create_ingame_and_shadow_pipelines(
                     &layouts.global,
                     &layouts.debug,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "debug pipeline creation",
@@ -573,6 +582,7 @@ fn create_ingame_and_shadow_pipelines(
                     &shaders.skybox_frag,
                     &layouts.global,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "skybox pipeline creation",
@@ -589,6 +599,7 @@ fn create_ingame_and_shadow_pipelines(
                     &layouts.global,
                     &layouts.figure,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "figure pipeline creation",
@@ -605,6 +616,7 @@ fn create_ingame_and_shadow_pipelines(
                     &layouts.global,
                     &layouts.terrain,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "terrain pipeline creation",
@@ -621,6 +633,7 @@ fn create_ingame_and_shadow_pipelines(
                     &layouts.global,
                     &layouts.terrain,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "fluid pipeline creation",
@@ -638,6 +651,7 @@ fn create_ingame_and_shadow_pipelines(
                     &layouts.sprite,
                     &layouts.terrain,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "sprite pipeline creation",
@@ -653,6 +667,7 @@ fn create_ingame_and_shadow_pipelines(
                     &shaders.lod_object_frag,
                     &layouts.global,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "lod object pipeline creation",
@@ -668,6 +683,7 @@ fn create_ingame_and_shadow_pipelines(
                     &shaders.particle_frag,
                     &layouts.global,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "particle pipeline creation",
@@ -699,6 +715,7 @@ fn create_ingame_and_shadow_pipelines(
                     &shaders.trail_frag,
                     &layouts.global,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "trail pipeline creation",
@@ -714,6 +731,7 @@ fn create_ingame_and_shadow_pipelines(
                     &shaders.lod_terrain_frag,
                     &layouts.global,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "lod terrain pipeline creation",
@@ -730,6 +748,7 @@ fn create_ingame_and_shadow_pipelines(
                     &layouts.global,
                     &layouts.clouds,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "clouds pipeline creation",
@@ -750,7 +769,7 @@ fn create_ingame_and_shadow_pipelines(
                         &shaders.dual_downsample_filtered_frag,
                         &shaders.dual_downsample_frag,
                         &shaders.dual_upsample_frag,
-                        wgpu::TextureFormat::Rgba16Float,
+                        format,
                         &layouts.bloom,
                         bloom_config,
                     )
@@ -974,8 +993,9 @@ pub(super) fn initial_create_pipelines(
     layouts: Layouts,
     shaders: Shaders,
     pipeline_modes: PipelineModes,
-    sc_desc: wgpu::SwapChainDescriptor,
+    surface_config: wgpu::SurfaceConfiguration,
     has_shadow_views: bool,
+    intermediate_format: wgpu::TextureFormat,
 ) -> Result<
     (
         InterfacePipelines,
@@ -999,7 +1019,7 @@ pub(super) fn initial_create_pipelines(
         layouts: &layouts,
         shaders: &shader_modules,
         pipeline_modes: &pipeline_modes,
-        sc_desc: &sc_desc,
+        surface_config: &surface_config,
     };
 
     // Create interface pipelines while blocking the main thread
@@ -1026,10 +1046,15 @@ pub(super) fn initial_create_pipelines(
             layouts: &layouts,
             shaders: &shader_modules,
             pipeline_modes: &pipeline_modes,
-            sc_desc: &sc_desc,
+            surface_config: &surface_config,
         };
 
-        let pipelines = create_ingame_and_shadow_pipelines(needs, pool, progress.create_tasks());
+        let pipelines = create_ingame_and_shadow_pipelines(
+            needs,
+            pool,
+            progress.create_tasks(),
+            intermediate_format,
+        );
 
         pipeline_send.send(pipelines).expect("Channel disconnected");
     });
@@ -1046,8 +1071,9 @@ pub(super) fn recreate_pipelines(
     immutable_layouts: Arc<ImmutableLayouts>,
     shaders: Shaders,
     pipeline_modes: PipelineModes,
-    sc_desc: wgpu::SwapChainDescriptor,
+    surface_config: wgpu::SurfaceConfiguration,
     has_shadow_views: bool,
+    intermediate_format: wgpu::TextureFormat,
 ) -> PipelineCreation<
     Result<
         (
@@ -1112,7 +1138,7 @@ pub(super) fn recreate_pipelines(
             layouts: &layouts,
             shaders: &shader_modules,
             pipeline_modes: &pipeline_modes,
-            sc_desc: &sc_desc,
+            surface_config: &surface_config,
         };
 
         // Create interface pipelines
@@ -1123,7 +1149,12 @@ pub(super) fn recreate_pipelines(
             ingame,
             shadow,
             rain_occlusion,
-        } = create_ingame_and_shadow_pipelines(needs, pool, ingame_and_shadow_tasks);
+        } = create_ingame_and_shadow_pipelines(
+            needs,
+            pool,
+            ingame_and_shadow_tasks,
+            intermediate_format,
+        );
 
         // Send them
         result_send
diff --git a/voxygen/src/render/renderer/rain_occlusion_map.rs b/voxygen/src/render/renderer/rain_occlusion_map.rs
index 3aae3a802d..720c821377 100644
--- a/voxygen/src/render/renderer/rain_occlusion_map.rs
+++ b/voxygen/src/render/renderer/rain_occlusion_map.rs
@@ -60,7 +60,9 @@ impl RainOcclusionMap {
                 sample_count: 1,
                 dimension: wgpu::TextureDimension::D2,
                 format: wgpu::TextureFormat::Depth24Plus,
-                usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::RENDER_ATTACHMENT,
+                usage: wgpu::TextureUsages::TEXTURE_BINDING
+                    | wgpu::TextureUsages::RENDER_ATTACHMENT,
+                view_formats: &[],
             };
 
             let view = wgpu::TextureViewDescriptor {
@@ -101,10 +103,12 @@ impl RainOcclusionMap {
                 view: &tex.view,
                 depth_ops: Some(wgpu::Operations {
                     load: wgpu::LoadOp::Clear(1.0),
-                    store: true,
+                    store: wgpu::StoreOp::Store,
                 }),
                 stencil_ops: None,
             }),
+            timestamp_writes: None,
+            occlusion_query_set: None,
         });
 
         queue.submit(std::iter::once(encoder.finish()));
@@ -182,7 +186,8 @@ impl RainOcclusionMap {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Depth24Plus,
-            usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::RENDER_ATTACHMENT,
+            usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::RENDER_ATTACHMENT,
+            view_formats: &[],
         };
 
         let rain_occlusion_view = wgpu::TextureViewDescriptor {
diff --git a/voxygen/src/render/renderer/screenshot.rs b/voxygen/src/render/renderer/screenshot.rs
index c5c73c833a..fe606f3ac7 100644
--- a/voxygen/src/render/renderer/screenshot.rs
+++ b/voxygen/src/render/renderer/screenshot.rs
@@ -13,7 +13,7 @@ pub struct TakeScreenshot {
     // Dimensions used for copying from the screenshot texture to a buffer
     width: u32,
     height: u32,
-    bytes_per_pixel: u8,
+    bytes_per_pixel: u32,
     // Texture format
     tex_format: wgpu::TextureFormat,
 }
@@ -24,7 +24,7 @@ impl TakeScreenshot {
         blit_layout: &blit::BlitLayout,
         sampler: &wgpu::Sampler,
         // Used to determine the resolution and texture format
-        sc_desc: &wgpu::SwapChainDescriptor,
+        surface_config: &wgpu::SurfaceConfiguration,
         // Function that is given the image after downloading it from the GPU
         // This is executed in a background thread
         screenshot_fn: ScreenshotFn,
@@ -32,22 +32,23 @@ impl TakeScreenshot {
         let texture = device.create_texture(&wgpu::TextureDescriptor {
             label: Some("screenshot tex"),
             size: wgpu::Extent3d {
-                width: sc_desc.width,
-                height: sc_desc.height,
+                width: surface_config.width,
+                height: surface_config.height,
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
-            format: sc_desc.format,
-            usage: wgpu::TextureUsage::COPY_SRC
-                | wgpu::TextureUsage::SAMPLED
-                | wgpu::TextureUsage::RENDER_ATTACHMENT,
+            format: surface_config.format,
+            usage: wgpu::TextureUsages::COPY_SRC
+                | wgpu::TextureUsages::TEXTURE_BINDING
+                | wgpu::TextureUsages::RENDER_ATTACHMENT,
+            view_formats: &[],
         });
 
         let view = texture.create_view(&wgpu::TextureViewDescriptor {
             label: Some("screenshot tex view"),
-            format: Some(sc_desc.format),
+            format: Some(surface_config.format),
             dimension: Some(wgpu::TextureViewDimension::D2),
             aspect: wgpu::TextureAspect::All,
             base_mip_level: 0,
@@ -58,13 +59,13 @@ impl TakeScreenshot {
 
         let bind_group = blit_layout.bind(device, &view, sampler);
 
-        let bytes_per_pixel = sc_desc.format.describe().block_size;
-        let padded_bytes_per_row = padded_bytes_per_row(sc_desc.width, bytes_per_pixel);
+        let bytes_per_pixel = surface_config.format.block_size(None).unwrap();
+        let padded_bytes_per_row = padded_bytes_per_row(surface_config.width, bytes_per_pixel);
 
         let buffer = device.create_buffer(&wgpu::BufferDescriptor {
             label: Some("screenshot download buffer"),
-            size: (padded_bytes_per_row * sc_desc.height) as u64,
-            usage: wgpu::BufferUsage::COPY_DST | wgpu::BufferUsage::MAP_READ,
+            size: (padded_bytes_per_row * surface_config.height) as u64,
+            usage: wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::MAP_READ,
             mapped_at_creation: false,
         });
 
@@ -74,10 +75,10 @@ impl TakeScreenshot {
             view,
             buffer,
             screenshot_fn,
-            width: sc_desc.width,
-            height: sc_desc.height,
+            width: surface_config.width,
+            height: surface_config.height,
             bytes_per_pixel,
-            tex_format: sc_desc.format,
+            tex_format: surface_config.format,
         }
     }
 
@@ -104,12 +105,13 @@ impl TakeScreenshot {
                 texture: &self.texture,
                 mip_level: 0,
                 origin: wgpu::Origin3d::ZERO,
+                aspect: wgpu::TextureAspect::All,
             },
             wgpu::ImageCopyBuffer {
                 buffer: &self.buffer,
                 layout: wgpu::ImageDataLayout {
                     offset: 0,
-                    bytes_per_row: core::num::NonZeroU32::new(padded_bytes_per_row),
+                    bytes_per_row: Some(padded_bytes_per_row),
                     rows_per_image: None,
                 },
             },
@@ -121,8 +123,10 @@ impl TakeScreenshot {
         );
 
         move || {
-            // Send buffer to another thread for async mapping, downloading, and passing to
-            // the given handler function (which probably saves it to the disk)
+            // TODO: Do we need a thread for this now that we handle screenshots in a
+            // callback from wgpu? Send buffer to another thread for async
+            // mapping, downloading, and passing to the given handler function
+            // (which probably saves it to the disk)
             std::thread::Builder::new()
                 .name("screenshot".into())
                 .spawn(move || {
@@ -136,100 +140,94 @@ impl TakeScreenshot {
         prof_span!("download_and_handle_internal");
         // Calculate padded bytes per row
         let padded_bytes_per_row = padded_bytes_per_row(self.width, self.bytes_per_pixel);
-        let singlethread_rt = match tokio::runtime::Builder::new_current_thread().build() {
-            Ok(rt) => rt,
-            Err(err) => {
-                error!(?err, "Could not create tokio runtime");
-                return;
-            },
-        };
 
         // Map buffer
-        let buffer_slice = self.buffer.slice(..);
-        let buffer_map_future = buffer_slice.map_async(wgpu::MapMode::Read);
-        let padded_buffer;
-
-        // Wait on buffer mapping
-        let rows = match singlethread_rt.block_on(buffer_map_future) {
-            // Buffer is mapped and we can read it
-            Ok(()) => {
-                // Copy to a Vec
-                padded_buffer = buffer_slice.get_mapped_range();
-                padded_buffer
-                    .chunks(padded_bytes_per_row as usize)
-                    .map(|padded_chunk| {
-                        &padded_chunk[..self.width as usize * self.bytes_per_pixel as usize]
-                    })
-            },
-            // Error
-            Err(err) => {
-                error!(
-                    ?err,
-                    "Failed to map buffer for downloading a screenshot from the GPU"
-                );
-                return;
-            },
-        };
-
-        // Note: we don't use bytes_per_pixel here since we expect only certain formats
-        // below.
-        let bytes_per_rgb = 3;
-        let mut pixel_bytes =
-            Vec::with_capacity(self.width as usize * self.height as usize * bytes_per_rgb);
-        // Construct image
-        let image = match self.tex_format {
-            wgpu::TextureFormat::Bgra8UnormSrgb => {
-                prof_span!("copy image");
-                rows.for_each(|row| {
-                    let (pixels, rest) = row.as_chunks();
-                    assert!(
-                        rest.is_empty(),
-                        "Always valid because each pixel uses four bytes"
+        let buffer = std::sync::Arc::new(self.buffer);
+        let buffer2 = std::sync::Arc::clone(&buffer);
+        let buffer_slice = buffer.slice(..);
+        buffer_slice.map_async(wgpu::MapMode::Read, move |result| {
+            let padded_buffer;
+            let buffer_slice = buffer2.slice(..);
+            let rows = match result {
+                Ok(()) => {
+                    // Copy to a Vec
+                    padded_buffer = buffer_slice.get_mapped_range();
+                    padded_buffer
+                        .chunks(padded_bytes_per_row as usize)
+                        .map(|padded_chunk| {
+                            &padded_chunk[..self.width as usize * self.bytes_per_pixel as usize]
+                        })
+                },
+                // Error
+                Err(err) => {
+                    error!(
+                        ?err,
+                        "Failed to map buffer for downloading a screenshot from the GPU"
                     );
-                    // Swap blue and red components and drop alpha to get a RGB texture.
-                    for &[b, g, r, _a] in pixels {
-                        pixel_bytes.extend_from_slice(&[r, g, b])
-                    }
-                });
+                    return;
+                },
+            };
 
-                Ok(pixel_bytes)
-            },
-            wgpu::TextureFormat::Rgba8UnormSrgb => {
-                prof_span!("copy image");
-                rows.for_each(|row| {
-                    let (pixels, rest) = row.as_chunks();
-                    assert!(
-                        rest.is_empty(),
-                        "Always valid because each pixel uses four bytes"
-                    );
-                    // Drop alpha to get a RGB texture.
-                    for &[r, g, b, _a] in pixels {
-                        pixel_bytes.extend_from_slice(&[r, g, b])
-                    }
-                });
+            // Note: we don't use bytes_per_pixel here since we expect only certain formats
+            // below.
+            let bytes_per_rgb = 3;
+            let mut pixel_bytes =
+                Vec::with_capacity(self.width as usize * self.height as usize * bytes_per_rgb);
+            // Construct image
+            let image = match self.tex_format {
+                wgpu::TextureFormat::Bgra8UnormSrgb => {
+                    prof_span!("copy image");
+                    rows.for_each(|row| {
+                        let (pixels, rest) = row.as_chunks();
+                        assert!(
+                            rest.is_empty(),
+                            "Always valid because each pixel uses four bytes"
+                        );
+                        // Swap blue and red components and drop alpha to get a RGB texture.
+                        for &[b, g, r, _a] in pixels {
+                            pixel_bytes.extend_from_slice(&[r, g, b])
+                        }
+                    });
 
-                Ok(pixel_bytes)
-            },
-            format => Err(format!(
-                "Unhandled format for screenshot texture: {:?}",
-                format,
-            )),
-        }
-        .map(|pixel_bytes| {
-            image::RgbImage::from_vec(self.width, self.height, pixel_bytes).expect(
-                "Failed to create ImageBuffer! Buffer was not large enough. This should not occur",
-            )
+                    Ok(pixel_bytes)
+                },
+                wgpu::TextureFormat::Rgba8UnormSrgb => {
+                    prof_span!("copy image");
+                    rows.for_each(|row| {
+                        let (pixels, rest) = row.as_chunks();
+                        assert!(
+                            rest.is_empty(),
+                            "Always valid because each pixel uses four bytes"
+                        );
+                        // Drop alpha to get a RGB texture.
+                        for &[r, g, b, _a] in pixels {
+                            pixel_bytes.extend_from_slice(&[r, g, b])
+                        }
+                    });
+
+                    Ok(pixel_bytes)
+                },
+                format => Err(format!(
+                    "Unhandled format for screenshot texture: {:?}",
+                    format,
+                )),
+            }
+            .map(|pixel_bytes| {
+                image::RgbImage::from_vec(self.width, self.height, pixel_bytes).expect(
+                    "Failed to create ImageBuffer! Buffer was not large enough. This should not \
+                     occur",
+                )
+            });
+            // Call supplied handler
+            (self.screenshot_fn)(image);
         });
-
-        // Call supplied handler
-        (self.screenshot_fn)(image);
     }
 }
 
 // Graphics API requires a specific alignment for buffer copies
-fn padded_bytes_per_row(width: u32, bytes_per_pixel: u8) -> u32 {
+fn padded_bytes_per_row(width: u32, bytes_per_pixel: u32) -> u32 {
     let align = wgpu::COPY_BYTES_PER_ROW_ALIGNMENT;
-    let unpadded_bytes_per_row = width * bytes_per_pixel as u32;
+    let unpadded_bytes_per_row = width * bytes_per_pixel;
     let padding = (align - unpadded_bytes_per_row % align) % align;
     unpadded_bytes_per_row + padding
 }
diff --git a/voxygen/src/render/renderer/shadow_map.rs b/voxygen/src/render/renderer/shadow_map.rs
index 10b994d994..ef9b363932 100644
--- a/voxygen/src/render/renderer/shadow_map.rs
+++ b/voxygen/src/render/renderer/shadow_map.rs
@@ -81,7 +81,9 @@ impl ShadowMap {
                 sample_count: 1,
                 dimension: wgpu::TextureDimension::D2,
                 format: wgpu::TextureFormat::Depth24Plus,
-                usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::RENDER_ATTACHMENT,
+                usage: wgpu::TextureUsages::TEXTURE_BINDING
+                    | wgpu::TextureUsages::RENDER_ATTACHMENT,
+                view_formats: &[],
             };
 
             let view = wgpu::TextureViewDescriptor {
@@ -125,10 +127,12 @@ impl ShadowMap {
                     view: &tex.view,
                     depth_ops: Some(wgpu::Operations {
                         load: wgpu::LoadOp::Clear(1.0),
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     }),
                     stencil_ops: None,
                 }),
+                timestamp_writes: None,
+                occlusion_query_set: None,
             });
         };
         clear(&cube_tex);
@@ -208,7 +212,8 @@ impl ShadowMap {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Depth24Plus,
-            usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::RENDER_ATTACHMENT,
+            usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::RENDER_ATTACHMENT,
+            view_formats: &[],
         };
 
         let point_shadow_view = wgpu::TextureViewDescriptor {
@@ -233,7 +238,8 @@ impl ShadowMap {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Depth24Plus,
-            usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::RENDER_ATTACHMENT,
+            usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::RENDER_ATTACHMENT,
+            view_formats: &[],
         };
 
         let directed_shadow_view = wgpu::TextureViewDescriptor {
diff --git a/voxygen/src/render/texture.rs b/voxygen/src/render/texture.rs
index 75b777785f..1a4a52e6a3 100644
--- a/voxygen/src/render/texture.rs
+++ b/voxygen/src/render/texture.rs
@@ -1,5 +1,4 @@
 use super::RenderError;
-use core::num::NonZeroU32;
 use image::DynamicImage;
 use wgpu::Extent3d;
 
@@ -55,7 +54,8 @@ impl Texture {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format,
-            usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST,
+            usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
+            view_formats: &[],
         });
 
         queue.write_texture(
@@ -63,12 +63,13 @@ impl Texture {
                 texture: &tex,
                 mip_level: 0,
                 origin: wgpu::Origin3d::ZERO,
+                aspect: wgpu::TextureAspect::All,
             },
             buffer.as_slice(),
             wgpu::ImageDataLayout {
                 offset: 0,
-                bytes_per_row: NonZeroU32::new(image.width() * bytes_per_pixel),
-                rows_per_image: NonZeroU32::new(image.height()),
+                bytes_per_row: Some(image.width() * bytes_per_pixel),
+                rows_per_image: Some(image.height()),
             },
             Extent3d {
                 width: image.width(),
@@ -128,7 +129,8 @@ impl Texture {
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
             // TODO: nondynamic version doesn't seeem to have different usage, unify code?
-            usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST,
+            usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
+            view_formats: &[],
         };
 
         let sampler_info = wgpu::SamplerDescriptor {
@@ -184,7 +186,7 @@ impl Texture {
         let byte_len = size.width as usize
             * size.height as usize
             * size.depth_or_array_layers as usize
-            * self.format.describe().block_size as usize;
+            * self.format.block_size(None).unwrap() as usize;
         let zeros = vec![0; byte_len];
 
         self.update(queue, [0, 0], [size.width, size.height], &zeros);
@@ -193,7 +195,7 @@ impl Texture {
     /// Update a texture with the given data (used for updating the glyph cache
     /// texture).
     pub fn update(&self, queue: &wgpu::Queue, offset: [u32; 2], size: [u32; 2], data: &[u8]) {
-        let bytes_per_pixel = self.format.describe().block_size as u32;
+        let bytes_per_pixel = self.format.block_size(None).unwrap() as u32;
 
         debug_assert_eq!(
             data.len(),
@@ -209,12 +211,13 @@ impl Texture {
                     y: offset[1],
                     z: 0,
                 },
+                aspect: wgpu::TextureAspect::All,
             },
             data,
             wgpu::ImageDataLayout {
                 offset: 0,
-                bytes_per_row: NonZeroU32::new(size[0] * bytes_per_pixel),
-                rows_per_image: NonZeroU32::new(size[1]),
+                bytes_per_row: Some(size[0] * bytes_per_pixel),
+                rows_per_image: Some(size[1]),
             },
             Extent3d {
                 width: size[0],
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index 1a09c74752..c3fb40086a 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -782,7 +782,7 @@ impl<V: RectRasterableVol> Terrain<V> {
             .map(|fmt| {
                 renderer.create_texture_raw(
                     &wgpu::TextureDescriptor {
-                        label: Some("Terrain atlas texture"),
+                        label: Some("Atlas texture"),
                         size: wgpu::Extent3d {
                             width: max_texture_size,
                             height: max_texture_size,
@@ -792,10 +792,11 @@ impl<V: RectRasterableVol> Terrain<V> {
                         sample_count: 1,
                         dimension: wgpu::TextureDimension::D2,
                         format: fmt,
-                        usage: wgpu::TextureUsage::COPY_DST | wgpu::TextureUsage::SAMPLED,
+                        usage: wgpu::TextureUsages::COPY_DST | wgpu::TextureUsages::TEXTURE_BINDING,
+                        view_formats: &[],
                     },
                     &wgpu::TextureViewDescriptor {
-                        label: Some("Terrain atlas texture view"),
+                        label: Some("Atlas texture view"),
                         format: Some(fmt),
                         dimension: Some(wgpu::TextureViewDimension::D2),
                         aspect: wgpu::TextureAspect::All,
@@ -805,7 +806,7 @@ impl<V: RectRasterableVol> Terrain<V> {
                         array_layer_count: None,
                     },
                     &wgpu::SamplerDescriptor {
-                        label: Some("Terrain atlas texture sampler"),
+                        label: Some("Atlas sampler"),
                         address_mode_u: wgpu::AddressMode::ClampToEdge,
                         address_mode_v: wgpu::AddressMode::ClampToEdge,
                         address_mode_w: wgpu::AddressMode::ClampToEdge,
diff --git a/voxygen/src/session/mod.rs b/voxygen/src/session/mod.rs
index 1ec6afb16e..8bbf6cf3ac 100644
--- a/voxygen/src/session/mod.rs
+++ b/voxygen/src/session/mod.rs
@@ -2146,7 +2146,8 @@ impl PlayState for SessionState {
         // PostProcess and UI
         {
             prof_span!("post-process and ui");
-            let mut third_pass = drawer.third_pass();
+            let mut third_pass_prepared = drawer.prepare_third_pass();
+            let mut third_pass = third_pass_prepared.drawer();
             third_pass.draw_postprocess();
             // Draw the UI to the screen
             if let Some(mut ui_drawer) = third_pass.draw_ui() {
diff --git a/voxygen/src/ui/graphic/mod.rs b/voxygen/src/ui/graphic/mod.rs
index 5d7b35bac6..38a0c8f8a6 100644
--- a/voxygen/src/ui/graphic/mod.rs
+++ b/voxygen/src/ui/graphic/mod.rs
@@ -695,7 +695,7 @@ fn create_image_texture(
     // TODO: Right now we have to manually clear images to workaround AMD DX bug,
     // for this we use Queue::write_texture which needs this usage. I think this
     // may be fixed in newer wgpu versions that auto-clear the texture.
-    let workaround_usage = wgpu::TextureUsage::COPY_DST;
+    let workaround_usage = wgpu::TextureUsages::COPY_DST;
     let tex_info = wgpu::TextureDescriptor {
         label: None,
         size: wgpu::Extent3d {
@@ -707,10 +707,11 @@ fn create_image_texture(
         sample_count: 1,
         dimension: wgpu::TextureDimension::D2,
         format: wgpu::TextureFormat::Rgba8UnormSrgb,
-        usage: wgpu::TextureUsage::RENDER_ATTACHMENT // GPU premultiply
-            | wgpu::TextureUsage::COPY_DST // CPU premultiply
-            | wgpu::TextureUsage::SAMPLED // using image in ui rendering
+        usage: wgpu::TextureUsages::RENDER_ATTACHMENT // GPU premultiply
+            | wgpu::TextureUsages::COPY_DST // CPU premultiply
+            | wgpu::TextureUsages::TEXTURE_BINDING // using image in ui rendering
             | workaround_usage,
+        view_formats: &[],
     };
     let view_info = wgpu::TextureViewDescriptor {
         format: Some(tex_info.format),
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index e73a74a394..c7a3d02a6b 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -1039,17 +1039,12 @@ impl Window {
     pub fn is_cursor_grabbed(&self) -> bool { self.cursor_grabbed }
 
     pub fn grab_cursor(&mut self, grab: bool) {
-        use winit::window::CursorGrabMode;
-
         self.cursor_grabbed = grab;
         self.window.set_cursor_visible(!grab);
-        let res = if grab {
-            self.window
-                .set_cursor_grab(CursorGrabMode::Locked)
-                .or_else(|_e| self.window.set_cursor_grab(CursorGrabMode::Confined))
-        } else {
-            self.window.set_cursor_grab(CursorGrabMode::None)
-        };
+        let res = self.window.set_cursor_grab(match grab {
+            true => winit::window::CursorGrabMode::Confined,
+            false => winit::window::CursorGrabMode::None,
+        });
 
         if let Err(e) = res {
             error!(?e, ?grab, "Failed to toggle cursor grab");

From 9903d2c54515d5a5c00c0b3dc88360bcb4a07269 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sat, 28 Oct 2023 17:53:35 +0200
Subject: [PATCH 02/24] more testing

---
 .cargo/config                                 |   4 +-
 Cargo.lock                                    |  71 --------
 Cargo.toml                                    |  16 +-
 assets/voxygen/shaders/blit-frag.glsl         |   2 +-
 assets/voxygen/shaders/blit-vert.glsl         |   2 +-
 assets/voxygen/shaders/clouds-frag.glsl       |   2 +-
 assets/voxygen/shaders/clouds-vert.glsl       |   2 +-
 assets/voxygen/shaders/debug-frag.glsl        |   2 +-
 assets/voxygen/shaders/debug-vert.glsl        |   2 +-
 .../dual-downsample-filtered-frag.glsl        |   2 +-
 .../voxygen/shaders/dual-downsample-frag.glsl |   2 +-
 .../voxygen/shaders/dual-upsample-frag.glsl   |   2 +-
 assets/voxygen/shaders/figure-frag.glsl       |   2 +-
 assets/voxygen/shaders/figure-vert.glsl       |   2 +-
 assets/voxygen/shaders/fluid-frag/cheap.glsl  |   2 +-
 assets/voxygen/shaders/fluid-frag/shiny.glsl  |   2 +-
 assets/voxygen/shaders/fluid-vert.glsl        |   2 +-
 .../shaders/light-shadows-debug-vert.glsl     |   2 +-
 .../shaders/light-shadows-directed-vert.glsl  |   2 +-
 .../shaders/light-shadows-figure-vert.glsl    |   2 +-
 .../voxygen/shaders/light-shadows-frag.glsl   |   2 +-
 assets/voxygen/shaders/lod-object-frag.glsl   |   2 +-
 assets/voxygen/shaders/lod-object-vert.glsl   |   2 +-
 assets/voxygen/shaders/lod-terrain-frag.glsl  |   2 +-
 assets/voxygen/shaders/lod-terrain-vert.glsl  |   2 +-
 assets/voxygen/shaders/particle-frag.glsl     |   2 +-
 assets/voxygen/shaders/particle-vert.glsl     |   2 +-
 .../shaders/point-light-shadows-vert.glsl     |   2 +-
 assets/voxygen/shaders/postprocess-frag.glsl  |   2 +-
 assets/voxygen/shaders/postprocess-vert.glsl  |   2 +-
 .../shaders/premultiply-alpha-frag.glsl       |   2 +-
 .../shaders/premultiply-alpha-vert.glsl       |   2 +-
 .../shaders/rain-occlusion-directed-vert.glsl |   2 +-
 .../shaders/rain-occlusion-figure-vert.glsl   |   2 +-
 assets/voxygen/shaders/skybox-frag.glsl       |   2 +-
 assets/voxygen/shaders/skybox-vert.glsl       |   2 +-
 assets/voxygen/shaders/sprite-frag.glsl       |   2 +-
 assets/voxygen/shaders/sprite-vert.glsl       |   2 +-
 assets/voxygen/shaders/terrain-frag.glsl      |   2 +-
 assets/voxygen/shaders/terrain-vert.glsl      |   2 +-
 assets/voxygen/shaders/trail-frag.glsl        |   2 +-
 assets/voxygen/shaders/trail-vert.glsl        |   2 +-
 assets/voxygen/shaders/ui-frag.glsl           |   2 +-
 assets/voxygen/shaders/ui-vert.glsl           |   2 +-
 voxygen/Cargo.toml                            |   8 +-
 voxygen/src/render/error.rs                   |  16 +-
 .../src/render/renderer/pipeline_creation.rs  | 161 ++++++++----------
 47 files changed, 130 insertions(+), 228 deletions(-)

diff --git a/.cargo/config b/.cargo/config
index 87d684cbbf..c1c8be6a6c 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -25,8 +25,8 @@ tracy-server-debuginfo = "run --bin veloren-server-cli --features tracy,simd --p
 tracy-server-releasedebuginfo = "run --bin veloren-server-cli --features tracy,simd --profile releasedebuginfo"
 tracy-test-server = "run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow"
 # voxygen
-test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui,shaderc-from-source"
-tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui,shaderc-from-source --profile no_overflow"
+test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui"
+tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui --profile no_overflow"
 dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo"
 # misc
 swarm = "run --bin swarm --features client/bin_bot,client/tick_network --"
diff --git a/Cargo.lock b/Cargo.lock
index bccf52ed92..64623d09aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3646,7 +3646,6 @@ dependencies = [
  "indexmap 2.0.0",
  "log",
  "num-traits",
- "petgraph 0.6.4",
  "pp-rs",
  "rustc-hash",
  "serde",
@@ -5219,15 +5218,6 @@ version = "0.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "082f11ffa03bbef6c2c6ea6bea1acafaade2fd9050ae0234ab44a2153742b058"
 
-[[package]]
-name = "roxmltree"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b"
-dependencies = [
- "xmlparser",
-]
-
 [[package]]
 name = "rstar"
 version = "0.10.0"
@@ -5677,25 +5667,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "shaderc"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
-dependencies = [
- "libc",
- "shaderc-sys",
-]
-
-[[package]]
-name = "shaderc-sys"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
-dependencies = [
- "cmake",
- "libc",
- "roxmltree",
-]
-
 [[package]]
 name = "sharded-slab"
 version = "0.1.4"
@@ -7297,7 +7268,6 @@ dependencies = [
  "rodio",
  "ron",
  "serde",
- "shaderc",
  "slab",
  "specs",
  "strum",
@@ -8485,12 +8455,6 @@ version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"
 
-[[package]]
-name = "xmlparser"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd"
-
 [[package]]
 name = "yasna"
 version = "0.5.2"
@@ -8519,38 +8483,3 @@ dependencies = [
  "quote 1.0.33",
  "syn 2.0.32",
 ]
-
-[[patch.unused]]
-name = "gfx-backend-dx11"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-
-[[patch.unused]]
-name = "gfx-backend-dx12"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-
-[[patch.unused]]
-name = "gfx-backend-empty"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-
-[[patch.unused]]
-name = "gfx-backend-gl"
-version = "0.8.1"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-
-[[patch.unused]]
-name = "gfx-backend-metal"
-version = "0.8.1"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-
-[[patch.unused]]
-name = "gfx-backend-vulkan"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
-
-[[patch.unused]]
-name = "gfx-hal"
-version = "0.8.0"
-source = "git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1#a8ba0a4859abb5f980b02480cb219030fb64530c"
diff --git a/Cargo.toml b/Cargo.toml
index 8a23a9d4ef..717cea797c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -163,14 +163,14 @@ vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986
 ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "9f56b149c9e25796739157c0fce3e0007a7de6eb" }
 shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" }
 
-[patch."https://github.com/gfx-rs/gfx"]
-gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-gfx-backend-empty = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-gfx-backend-vulkan = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-gfx-backend-gl = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-gfx-backend-dx12 = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-gfx-backend-dx11 = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-gfx-backend-metal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
+# [patch."https://github.com/gfx-rs/gfx"]
+# gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
+# gfx-backend-empty = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
+# gfx-backend-vulkan = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
+# gfx-backend-gl = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
+# gfx-backend-dx12 = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
+# gfx-backend-dx11 = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
+# gfx-backend-metal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
 
 # # use the latest fixes in naga (remove when updates trickle down to wgpu-rs)
 # naga = { git = "https://github.com/gfx-rs/naga.git", rev = "3a0f0144112ff621dd7f731bf455adf6cab19164" }
diff --git a/assets/voxygen/shaders/blit-frag.glsl b/assets/voxygen/shaders/blit-frag.glsl
index 77977d759e..529c1d8026 100644
--- a/assets/voxygen/shaders/blit-frag.glsl
+++ b/assets/voxygen/shaders/blit-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 layout(set = 0, binding = 0)
 uniform texture2D t_src_color;
diff --git a/assets/voxygen/shaders/blit-vert.glsl b/assets/voxygen/shaders/blit-vert.glsl
index 4275f7605f..0093cc3e72 100644
--- a/assets/voxygen/shaders/blit-vert.glsl
+++ b/assets/voxygen/shaders/blit-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 layout(location = 0) out vec2 uv;
 
diff --git a/assets/voxygen/shaders/clouds-frag.glsl b/assets/voxygen/shaders/clouds-frag.glsl
index 2ea6e1f3af..6a3c960686 100644
--- a/assets/voxygen/shaders/clouds-frag.glsl
+++ b/assets/voxygen/shaders/clouds-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/clouds-vert.glsl b/assets/voxygen/shaders/clouds-vert.glsl
index 2b7c7cfd50..e9b38bff7a 100644
--- a/assets/voxygen/shaders/clouds-vert.glsl
+++ b/assets/voxygen/shaders/clouds-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/debug-frag.glsl b/assets/voxygen/shaders/debug-frag.glsl
index a92afa226d..6bee75b33e 100644
--- a/assets/voxygen/shaders/debug-frag.glsl
+++ b/assets/voxygen/shaders/debug-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #define HAS_SHADOW_MAPS
 
diff --git a/assets/voxygen/shaders/debug-vert.glsl b/assets/voxygen/shaders/debug-vert.glsl
index a9b93e8791..1c2989f830 100644
--- a/assets/voxygen/shaders/debug-vert.glsl
+++ b/assets/voxygen/shaders/debug-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <globals.glsl>
 
diff --git a/assets/voxygen/shaders/dual-downsample-filtered-frag.glsl b/assets/voxygen/shaders/dual-downsample-filtered-frag.glsl
index 107a0066ec..679b494735 100644
--- a/assets/voxygen/shaders/dual-downsample-filtered-frag.glsl
+++ b/assets/voxygen/shaders/dual-downsample-filtered-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 layout(set = 0, binding = 0)
 uniform texture2D t_src_color;
diff --git a/assets/voxygen/shaders/dual-downsample-frag.glsl b/assets/voxygen/shaders/dual-downsample-frag.glsl
index b535d8f22c..d205ba32a7 100644
--- a/assets/voxygen/shaders/dual-downsample-frag.glsl
+++ b/assets/voxygen/shaders/dual-downsample-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 layout(set = 0, binding = 0)
 uniform texture2D t_src_color;
diff --git a/assets/voxygen/shaders/dual-upsample-frag.glsl b/assets/voxygen/shaders/dual-upsample-frag.glsl
index a3d66808f2..ba4dfd9aec 100644
--- a/assets/voxygen/shaders/dual-upsample-frag.glsl
+++ b/assets/voxygen/shaders/dual-upsample-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 layout(set = 0, binding = 0)
 uniform texture2D t_src_color;
diff --git a/assets/voxygen/shaders/figure-frag.glsl b/assets/voxygen/shaders/figure-frag.glsl
index 22c8cf1dc2..d7bb36ac65 100644
--- a/assets/voxygen/shaders/figure-frag.glsl
+++ b/assets/voxygen/shaders/figure-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #define FIGURE_SHADER
 
diff --git a/assets/voxygen/shaders/figure-vert.glsl b/assets/voxygen/shaders/figure-vert.glsl
index f4ac2e7c9b..320b482622 100644
--- a/assets/voxygen/shaders/figure-vert.glsl
+++ b/assets/voxygen/shaders/figure-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/fluid-frag/cheap.glsl b/assets/voxygen/shaders/fluid-frag/cheap.glsl
index 2af4c4d944..7037e51c89 100644
--- a/assets/voxygen/shaders/fluid-frag/cheap.glsl
+++ b/assets/voxygen/shaders/fluid-frag/cheap.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/fluid-frag/shiny.glsl b/assets/voxygen/shaders/fluid-frag/shiny.glsl
index 30cac8da6c..fac5ccbcf4 100644
--- a/assets/voxygen/shaders/fluid-frag/shiny.glsl
+++ b/assets/voxygen/shaders/fluid-frag/shiny.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/fluid-vert.glsl b/assets/voxygen/shaders/fluid-vert.glsl
index f3e3bddc2b..0ae2b6fd83 100644
--- a/assets/voxygen/shaders/fluid-vert.glsl
+++ b/assets/voxygen/shaders/fluid-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/light-shadows-debug-vert.glsl b/assets/voxygen/shaders/light-shadows-debug-vert.glsl
index f8e1f898bc..325c1df668 100644
--- a/assets/voxygen/shaders/light-shadows-debug-vert.glsl
+++ b/assets/voxygen/shaders/light-shadows-debug-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <globals.glsl>
 
diff --git a/assets/voxygen/shaders/light-shadows-directed-vert.glsl b/assets/voxygen/shaders/light-shadows-directed-vert.glsl
index f452da0acc..b68abe98e1 100644
--- a/assets/voxygen/shaders/light-shadows-directed-vert.glsl
+++ b/assets/voxygen/shaders/light-shadows-directed-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 // #extension ARB_texture_storage : enable
 
 #include <constants.glsl>
diff --git a/assets/voxygen/shaders/light-shadows-figure-vert.glsl b/assets/voxygen/shaders/light-shadows-figure-vert.glsl
index 1e769da060..823cbf8d9e 100644
--- a/assets/voxygen/shaders/light-shadows-figure-vert.glsl
+++ b/assets/voxygen/shaders/light-shadows-figure-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 // #extension ARB_texture_storage : enable
 
 #define FIGURE_SHADER
diff --git a/assets/voxygen/shaders/light-shadows-frag.glsl b/assets/voxygen/shaders/light-shadows-frag.glsl
index e176449518..0aa94ddb50 100644
--- a/assets/voxygen/shaders/light-shadows-frag.glsl
+++ b/assets/voxygen/shaders/light-shadows-frag.glsl
@@ -2,7 +2,7 @@
 //
 // However, in the future we might apply some depth transforms here.
 
-#version 430 core
+#version 440 core
 // #extension ARB_texture_storage : enable
 
 #include <constants.glsl>
diff --git a/assets/voxygen/shaders/lod-object-frag.glsl b/assets/voxygen/shaders/lod-object-frag.glsl
index f5fdd1f368..9b1a98aa09 100644
--- a/assets/voxygen/shaders/lod-object-frag.glsl
+++ b/assets/voxygen/shaders/lod-object-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/lod-object-vert.glsl b/assets/voxygen/shaders/lod-object-vert.glsl
index 4f6afc77fa..aebbef7b0f 100644
--- a/assets/voxygen/shaders/lod-object-vert.glsl
+++ b/assets/voxygen/shaders/lod-object-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/lod-terrain-frag.glsl b/assets/voxygen/shaders/lod-terrain-frag.glsl
index 1115c77f43..7395b90433 100644
--- a/assets/voxygen/shaders/lod-terrain-frag.glsl
+++ b/assets/voxygen/shaders/lod-terrain-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/lod-terrain-vert.glsl b/assets/voxygen/shaders/lod-terrain-vert.glsl
index b0982773bd..ae2810d2c4 100644
--- a/assets/voxygen/shaders/lod-terrain-vert.glsl
+++ b/assets/voxygen/shaders/lod-terrain-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/particle-frag.glsl b/assets/voxygen/shaders/particle-frag.glsl
index 3cb699468a..c659120b8d 100644
--- a/assets/voxygen/shaders/particle-frag.glsl
+++ b/assets/voxygen/shaders/particle-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/particle-vert.glsl b/assets/voxygen/shaders/particle-vert.glsl
index f491a0e06c..b59f41a2ec 100644
--- a/assets/voxygen/shaders/particle-vert.glsl
+++ b/assets/voxygen/shaders/particle-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/point-light-shadows-vert.glsl b/assets/voxygen/shaders/point-light-shadows-vert.glsl
index 2cd896f16b..92bd3dbe96 100644
--- a/assets/voxygen/shaders/point-light-shadows-vert.glsl
+++ b/assets/voxygen/shaders/point-light-shadows-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 // #extension ARB_texture_storage : enable
 
 #include <constants.glsl>
diff --git a/assets/voxygen/shaders/postprocess-frag.glsl b/assets/voxygen/shaders/postprocess-frag.glsl
index 8d94eee79c..8ce1548744 100644
--- a/assets/voxygen/shaders/postprocess-frag.glsl
+++ b/assets/voxygen/shaders/postprocess-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/postprocess-vert.glsl b/assets/voxygen/shaders/postprocess-vert.glsl
index 4665360e2a..a3004c83ee 100644
--- a/assets/voxygen/shaders/postprocess-vert.glsl
+++ b/assets/voxygen/shaders/postprocess-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/premultiply-alpha-frag.glsl b/assets/voxygen/shaders/premultiply-alpha-frag.glsl
index e502472e03..f2997c35c7 100644
--- a/assets/voxygen/shaders/premultiply-alpha-frag.glsl
+++ b/assets/voxygen/shaders/premultiply-alpha-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 #extension GL_EXT_samplerless_texture_functions : enable
 
 layout(set = 0, binding = 0)
diff --git a/assets/voxygen/shaders/premultiply-alpha-vert.glsl b/assets/voxygen/shaders/premultiply-alpha-vert.glsl
index e8737f9e9b..18f8f577a5 100644
--- a/assets/voxygen/shaders/premultiply-alpha-vert.glsl
+++ b/assets/voxygen/shaders/premultiply-alpha-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 layout(push_constant) uniform Params {
     // Size of the source image.
diff --git a/assets/voxygen/shaders/rain-occlusion-directed-vert.glsl b/assets/voxygen/shaders/rain-occlusion-directed-vert.glsl
index 458ca495c2..1f6098c320 100644
--- a/assets/voxygen/shaders/rain-occlusion-directed-vert.glsl
+++ b/assets/voxygen/shaders/rain-occlusion-directed-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 // #extension ARB_texture_storage : enable
 
 #include <constants.glsl>
diff --git a/assets/voxygen/shaders/rain-occlusion-figure-vert.glsl b/assets/voxygen/shaders/rain-occlusion-figure-vert.glsl
index 447ce7fd51..7deec6a392 100644
--- a/assets/voxygen/shaders/rain-occlusion-figure-vert.glsl
+++ b/assets/voxygen/shaders/rain-occlusion-figure-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 // #extension ARB_texture_storage : enable
 
 #define FIGURE_SHADER
diff --git a/assets/voxygen/shaders/skybox-frag.glsl b/assets/voxygen/shaders/skybox-frag.glsl
index 8a1ce8dcd3..5b5f0fc09a 100644
--- a/assets/voxygen/shaders/skybox-frag.glsl
+++ b/assets/voxygen/shaders/skybox-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/skybox-vert.glsl b/assets/voxygen/shaders/skybox-vert.glsl
index 7457aad8bf..bd4bf66d40 100644
--- a/assets/voxygen/shaders/skybox-vert.glsl
+++ b/assets/voxygen/shaders/skybox-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/sprite-frag.glsl b/assets/voxygen/shaders/sprite-frag.glsl
index c3fce24502..1ceef03098 100644
--- a/assets/voxygen/shaders/sprite-frag.glsl
+++ b/assets/voxygen/shaders/sprite-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/sprite-vert.glsl b/assets/voxygen/shaders/sprite-vert.glsl
index 4e60b7cbec..9147772289 100644
--- a/assets/voxygen/shaders/sprite-vert.glsl
+++ b/assets/voxygen/shaders/sprite-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/terrain-frag.glsl b/assets/voxygen/shaders/terrain-frag.glsl
index bbdbab96e1..54651233d4 100644
--- a/assets/voxygen/shaders/terrain-frag.glsl
+++ b/assets/voxygen/shaders/terrain-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 // #extension GL_ARB_texture_storage : require
 
 #include <constants.glsl>
diff --git a/assets/voxygen/shaders/terrain-vert.glsl b/assets/voxygen/shaders/terrain-vert.glsl
index c18eb88db8..2fbbb52009 100644
--- a/assets/voxygen/shaders/terrain-vert.glsl
+++ b/assets/voxygen/shaders/terrain-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/trail-frag.glsl b/assets/voxygen/shaders/trail-frag.glsl
index 20e990235a..42e2c5bcf5 100644
--- a/assets/voxygen/shaders/trail-frag.glsl
+++ b/assets/voxygen/shaders/trail-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <constants.glsl>
 
diff --git a/assets/voxygen/shaders/trail-vert.glsl b/assets/voxygen/shaders/trail-vert.glsl
index 6eab68b7b5..e474ac048c 100644
--- a/assets/voxygen/shaders/trail-vert.glsl
+++ b/assets/voxygen/shaders/trail-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <globals.glsl>
 
diff --git a/assets/voxygen/shaders/ui-frag.glsl b/assets/voxygen/shaders/ui-frag.glsl
index 8bd8930975..f4623ee9c4 100644
--- a/assets/voxygen/shaders/ui-frag.glsl
+++ b/assets/voxygen/shaders/ui-frag.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <globals.glsl>
 #include <constants.glsl>
diff --git a/assets/voxygen/shaders/ui-vert.glsl b/assets/voxygen/shaders/ui-vert.glsl
index c28c9bd324..61a866f34c 100644
--- a/assets/voxygen/shaders/ui-vert.glsl
+++ b/assets/voxygen/shaders/ui-vert.glsl
@@ -1,4 +1,4 @@
-#version 430 core
+#version 440 core
 
 #include <globals.glsl>
 
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 708dba4025..0d468e8ccc 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -29,14 +29,13 @@ tracy = ["common-frontend/tracy", "client/tracy"]
 tracy-memory = ["tracy"] # enables heap profiling with tracy
 plugins = ["client/plugins", "common-assets/plugins"]
 egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend", "egui_winit_platform"]
-shaderc-from-source = ["shaderc/build-from-source"]
 discord = ["discord-sdk"]
 bin_img-export = ["common-assets"]
 
 # We don't ship egui with published release builds so a separate feature is required that excludes it.
 default-publish = ["singleplayer", "native-dialog", "plugins", "discord", "simd"]
 # Temp for bug on current wgpu version that has access violation in vulkan when constructing egui pipeline
-default-no-egui = ["default-publish", "hot-reloading", "shaderc-from-source"]
+default-no-egui = ["default-publish", "hot-reloading"]
 default = ["default-no-egui", "egui-ui"]
 
 [dependencies]
@@ -57,12 +56,9 @@ voxygen-egui = {package = "veloren-voxygen-egui", path = "egui", optional = true
 
 # Graphics
 winit = {version = "0.28.6", features = ["serde"]}
-wgpu = { version = "=0.18.0", features = ["trace", "spirv", "glsl"] }
+wgpu = { version = "=0.18.0", features = ["trace", "glsl"] }
 wgpu-profiler = "0.15.0"
 bytemuck = { version="1.7", features=["derive"] }
-# shaderc = "0.8.0"
-# Working around a current bug in shaderc that causes it to use the system installation even if we specify compile from source
-shaderc = { git = "https://github.com/pythonesque/shaderc-rs", rev = "f2605a02062834019bedff911aee2fd2998c49f9" }
 # cmake crate used by shaderc, newer version 0.1.46 uses a new cmake command that is not available in our CI cmake version
 # see https://github.com/alexcrichton/cmake-rs/issues/131
 cmake = "=0.1.45"
diff --git a/voxygen/src/render/error.rs b/voxygen/src/render/error.rs
index 25c585a022..01cd27fea3 100644
--- a/voxygen/src/render/error.rs
+++ b/voxygen/src/render/error.rs
@@ -7,7 +7,7 @@ pub enum RenderError {
     CustomError(String),
     CouldNotFindAdapter,
     ErrorInitializingCompiler,
-    ShaderError(String, shaderc::Error),
+    // ShaderError(String, shaderc::Error),
     ProfilerCreationError(wgpu_profiler::CreationError),
 }
 
@@ -27,10 +27,10 @@ impl fmt::Debug for RenderError {
             Self::CustomError(err) => f.debug_tuple("CustomError").field(err).finish(),
             Self::CouldNotFindAdapter => f.debug_tuple("CouldNotFindAdapter").finish(),
             Self::ErrorInitializingCompiler => f.debug_tuple("ErrorInitializingCompiler").finish(),
-            Self::ShaderError(shader_name, err) => write!(
-                f,
-                "\"{shader_name}\" shader failed to compile due to the following error: {err}",
-            ),
+            // Self::ShaderError(shader_name, err) => write!(
+            //     f,
+            //     "\"{shader_name}\" shader failed to compile due to the following error: {err}",
+            // ),
             RenderError::ProfilerCreationError(err) => write!(f, "Profiler creation error: {err}"),
         }
     }
@@ -47,9 +47,3 @@ impl From<wgpu::BufferAsyncError> for RenderError {
 impl From<wgpu::SurfaceError> for RenderError {
     fn from(err: wgpu::SurfaceError) -> Self { Self::SurfaceError(err) }
 }
-
-impl From<(&str, shaderc::Error)> for RenderError {
-    fn from((shader_name, err): (&str, shaderc::Error)) -> Self {
-        Self::ShaderError(shader_name.into(), err)
-    }
-}
diff --git a/voxygen/src/render/renderer/pipeline_creation.rs b/voxygen/src/render/renderer/pipeline_creation.rs
index 680cc272a2..c991255356 100644
--- a/voxygen/src/render/renderer/pipeline_creation.rs
+++ b/voxygen/src/render/renderer/pipeline_creation.rs
@@ -164,7 +164,6 @@ impl ShaderModules {
         has_shadow_views: bool,
     ) -> Result<Self, RenderError> {
         prof_span!(_guard, "ShaderModules::new");
-        use shaderc::{CompileOptions, Compiler, OptimizationLevel, ResolvedInclude, ShaderKind};
 
         let constants = shaders.get("include.constants").unwrap();
         let globals = shaders.get("include.globals").unwrap();
@@ -280,45 +279,32 @@ impl ShaderModules {
             })
             .unwrap();
 
-        let mut compiler = Compiler::new().ok_or(RenderError::ErrorInitializingCompiler)?;
-        let mut options = CompileOptions::new().ok_or(RenderError::ErrorInitializingCompiler)?;
-        options.set_optimization_level(OptimizationLevel::Zero);
-        options.set_forced_version_profile(430, shaderc::GlslProfile::Core);
-        // options.set_generate_debug_info();
-        options.set_include_callback(move |name, _, shader_name, _| {
-            Ok(ResolvedInclude {
-                resolved_name: name.to_string(),
-                content: match name {
-                    "constants.glsl" => constants.clone(),
-                    "globals.glsl" => globals.0.to_owned(),
-                    "shadows.glsl" => shadows.0.to_owned(),
-                    "rain_occlusion.glsl" => rain_occlusion.0.to_owned(),
-                    "sky.glsl" => sky.0.to_owned(),
-                    "light.glsl" => light.0.to_owned(),
-                    "srgb.glsl" => srgb.0.to_owned(),
-                    "random.glsl" => random.0.to_owned(),
-                    "lod.glsl" => lod.0.to_owned(),
-                    "anti-aliasing.glsl" => anti_alias.0.to_owned(),
-                    "cloud.glsl" => cloud.0.to_owned(),
-                    "point_glow.glsl" => point_glow.0.to_owned(),
-                    "fxaa.glsl" => fxaa.0.to_owned(),
-                    other => {
-                        return Err(format!(
-                            "Include {} in {} is not defined",
-                            other, shader_name
-                        ));
-                    },
-                },
-            })
-        });
+        let defines = wgpu::naga::FastHashMap::from_iter([
+            ("constants.glsl".to_string(), constants.clone()),
+            ("globals.glsl".to_string(), globals.0.to_owned()),
+            ("shadows.glsl".to_string(), shadows.0.to_owned()),
+            (
+                "rain_occlusion.glsl".to_string(),
+                rain_occlusion.0.to_owned(),
+            ),
+            ("sky.glsl".to_string(), sky.0.to_owned()),
+            ("light.glsl".to_string(), light.0.to_owned()),
+            ("srgb.glsl".to_string(), srgb.0.to_owned()),
+            ("random.glsl".to_string(), random.0.to_owned()),
+            ("lod.glsl".to_string(), lod.0.to_owned()),
+            ("anti-aliasing.glsl".to_string(), anti_alias.0.to_owned()),
+            ("cloud.glsl".to_string(), cloud.0.to_owned()),
+            ("point_glow.glsl".to_string(), point_glow.0.to_owned()),
+            ("fxaa.glsl".to_string(), fxaa.0.to_owned()),
+        ]);
 
-        let mut create_shader = |name, kind| {
+        let create_shader = |name, stage| {
             let glsl = &shaders
                 .get(name)
                 .unwrap_or_else(|| panic!("Can't retrieve shader: {}", name))
                 .0;
             let file_name = format!("{}.glsl", name);
-            create_shader_module(device, &mut compiler, glsl, kind, &file_name, &options)
+            create_shader_module(device, defines.clone(), glsl, stage, &file_name)
         };
 
         let selected_fluid_shader = ["fluid-frag.", match pipeline_modes.fluid {
@@ -327,68 +313,69 @@ impl ShaderModules {
         }]
         .concat();
 
+        use wgpu::naga::ShaderStage;
         Ok(Self {
-            skybox_vert: create_shader("skybox-vert", ShaderKind::Vertex)?,
-            skybox_frag: create_shader("skybox-frag", ShaderKind::Fragment)?,
-            debug_vert: create_shader("debug-vert", ShaderKind::Vertex)?,
-            debug_frag: create_shader("debug-frag", ShaderKind::Fragment)?,
-            figure_vert: create_shader("figure-vert", ShaderKind::Vertex)?,
-            figure_frag: create_shader("figure-frag", ShaderKind::Fragment)?,
-            terrain_vert: create_shader("terrain-vert", ShaderKind::Vertex)?,
-            terrain_frag: create_shader("terrain-frag", ShaderKind::Fragment)?,
-            fluid_vert: create_shader("fluid-vert", ShaderKind::Vertex)?,
-            fluid_frag: create_shader(&selected_fluid_shader, ShaderKind::Fragment)?,
-            sprite_vert: create_shader("sprite-vert", ShaderKind::Vertex)?,
-            sprite_frag: create_shader("sprite-frag", ShaderKind::Fragment)?,
-            lod_object_vert: create_shader("lod-object-vert", ShaderKind::Vertex)?,
-            lod_object_frag: create_shader("lod-object-frag", ShaderKind::Fragment)?,
-            particle_vert: create_shader("particle-vert", ShaderKind::Vertex)?,
-            particle_frag: create_shader("particle-frag", ShaderKind::Fragment)?,
-            rope_vert: create_shader("rope-vert", ShaderKind::Vertex)?,
-            rope_frag: create_shader("rope-frag", ShaderKind::Fragment)?,
-            trail_vert: create_shader("trail-vert", ShaderKind::Vertex)?,
-            trail_frag: create_shader("trail-frag", ShaderKind::Fragment)?,
-            ui_vert: create_shader("ui-vert", ShaderKind::Vertex)?,
-            ui_frag: create_shader("ui-frag", ShaderKind::Fragment)?,
-            premultiply_alpha_vert: create_shader("premultiply-alpha-vert", ShaderKind::Vertex)?,
-            premultiply_alpha_frag: create_shader("premultiply-alpha-frag", ShaderKind::Fragment)?,
-            lod_terrain_vert: create_shader("lod-terrain-vert", ShaderKind::Vertex)?,
-            lod_terrain_frag: create_shader("lod-terrain-frag", ShaderKind::Fragment)?,
-            clouds_vert: create_shader("clouds-vert", ShaderKind::Vertex)?,
-            clouds_frag: create_shader("clouds-frag", ShaderKind::Fragment)?,
+            skybox_vert: create_shader("skybox-vert", ShaderStage::Vertex)?,
+            skybox_frag: create_shader("skybox-frag", ShaderStage::Fragment)?,
+            debug_vert: create_shader("debug-vert", ShaderStage::Vertex)?,
+            debug_frag: create_shader("debug-frag", ShaderStage::Fragment)?,
+            figure_vert: create_shader("figure-vert", ShaderStage::Vertex)?,
+            figure_frag: create_shader("figure-frag", ShaderStage::Fragment)?,
+            terrain_vert: create_shader("terrain-vert", ShaderStage::Vertex)?,
+            terrain_frag: create_shader("terrain-frag", ShaderStage::Fragment)?,
+            fluid_vert: create_shader("fluid-vert", ShaderStage::Vertex)?,
+            fluid_frag: create_shader(&selected_fluid_shader, ShaderStage::Fragment)?,
+            sprite_vert: create_shader("sprite-vert", ShaderStage::Vertex)?,
+            sprite_frag: create_shader("sprite-frag", ShaderStage::Fragment)?,
+            lod_object_vert: create_shader("lod-object-vert", ShaderStage::Vertex)?,
+            lod_object_frag: create_shader("lod-object-frag", ShaderStage::Fragment)?,
+            particle_vert: create_shader("particle-vert", ShaderStage::Vertex)?,
+            particle_frag: create_shader("particle-frag", ShaderStage::Fragment)?,
+            rope_vert: create_shader("rope-vert", ShaderStage::Vertex)?,
+            rope_frag: create_shader("rope-frag", ShaderStage::Fragment)?,
+            trail_vert: create_shader("trail-vert", ShaderStage::Vertex)?,
+            trail_frag: create_shader("trail-frag", ShaderStage::Fragment)?,
+            ui_vert: create_shader("ui-vert", ShaderStage::Vertex)?,
+            ui_frag: create_shader("ui-frag", ShaderStage::Fragment)?,
+            premultiply_alpha_vert: create_shader("premultiply-alpha-vert", ShaderStage::Vertex)?,
+            premultiply_alpha_frag: create_shader("premultiply-alpha-frag", ShaderStage::Fragment)?,
+            lod_terrain_vert: create_shader("lod-terrain-vert", ShaderStage::Vertex)?,
+            lod_terrain_frag: create_shader("lod-terrain-frag", ShaderStage::Fragment)?,
+            clouds_vert: create_shader("clouds-vert", ShaderStage::Vertex)?,
+            clouds_frag: create_shader("clouds-frag", ShaderStage::Fragment)?,
             dual_downsample_filtered_frag: create_shader(
                 "dual-downsample-filtered-frag",
-                ShaderKind::Fragment,
+                ShaderStage::Fragment,
             )?,
-            dual_downsample_frag: create_shader("dual-downsample-frag", ShaderKind::Fragment)?,
-            dual_upsample_frag: create_shader("dual-upsample-frag", ShaderKind::Fragment)?,
-            postprocess_vert: create_shader("postprocess-vert", ShaderKind::Vertex)?,
-            postprocess_frag: create_shader("postprocess-frag", ShaderKind::Fragment)?,
-            blit_vert: create_shader("blit-vert", ShaderKind::Vertex)?,
-            blit_frag: create_shader("blit-frag", ShaderKind::Fragment)?,
+            dual_downsample_frag: create_shader("dual-downsample-frag", ShaderStage::Fragment)?,
+            dual_upsample_frag: create_shader("dual-upsample-frag", ShaderStage::Fragment)?,
+            postprocess_vert: create_shader("postprocess-vert", ShaderStage::Vertex)?,
+            postprocess_frag: create_shader("postprocess-frag", ShaderStage::Fragment)?,
+            blit_vert: create_shader("blit-vert", ShaderStage::Vertex)?,
+            blit_frag: create_shader("blit-frag", ShaderStage::Fragment)?,
             point_light_shadows_vert: create_shader(
                 "point-light-shadows-vert",
-                ShaderKind::Vertex,
+                ShaderStage::Vertex,
             )?,
             light_shadows_directed_vert: create_shader(
                 "light-shadows-directed-vert",
-                ShaderKind::Vertex,
+                ShaderStage::Vertex,
             )?,
             light_shadows_figure_vert: create_shader(
                 "light-shadows-figure-vert",
-                ShaderKind::Vertex,
+                ShaderStage::Vertex,
             )?,
             light_shadows_debug_vert: create_shader(
                 "light-shadows-debug-vert",
-                ShaderKind::Vertex,
+                ShaderStage::Vertex,
             )?,
             rain_occlusion_directed_vert: create_shader(
                 "rain-occlusion-directed-vert",
-                ShaderKind::Vertex,
+                ShaderStage::Vertex,
             )?,
             rain_occlusion_figure_vert: create_shader(
                 "rain-occlusion-figure-vert",
-                ShaderKind::Vertex,
+                ShaderStage::Vertex,
             )?,
         })
     }
@@ -396,19 +383,14 @@ impl ShaderModules {
 
 fn create_shader_module(
     device: &wgpu::Device,
-    compiler: &mut shaderc::Compiler,
+    defines: wgpu::naga::FastHashMap<String, String>,
     source: &str,
-    kind: shaderc::ShaderKind,
+    stage: wgpu::naga::ShaderStage,
     file_name: &str,
-    options: &shaderc::CompileOptions,
 ) -> Result<wgpu::ShaderModule, RenderError> {
     prof_span!(_guard, "create_shader_modules");
     use std::borrow::Cow;
 
-    let spv = compiler
-        .compile_into_spirv(source, kind, file_name, "main", Some(options))
-        .map_err(|e| (file_name, e))?;
-
     // Uncomment me to dump shaders to files
     //
     // std::fs::create_dir_all("dumpped-shaders").expect("Couldn't create shader
@@ -423,13 +405,14 @@ fn create_shader_module(
     //     .expect("Couldn't write shader out");
 
     // let label = [file_name, "\n\n", source].concat();
-    #[allow(unsafe_code)]
-    Ok(unsafe {
-        device.create_shader_module_unchecked(wgpu::ShaderModuleDescriptor {
-            label: Some(file_name),
-            source: wgpu::ShaderSource::SpirV(Cow::Borrowed(spv.as_binary())),
-        })
-    })
+    Ok(device.create_shader_module(wgpu::ShaderModuleDescriptor {
+        label: Some(file_name),
+        source: wgpu::ShaderSource::Glsl {
+            shader: Cow::Borrowed(source),
+            stage,
+            defines,
+        },
+    }))
 }
 
 /// Things needed to create a pipeline

From 165c88bd74cc81603c65166b9ab7dbcb21610a6d Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sun, 7 Jan 2024 17:51:44 +0100
Subject: [PATCH 03/24] patch wgpu to 18.2

---
 Cargo.lock                                    |  93 ++++++----
 Cargo.toml                                    |   1 +
 voxygen/Cargo.toml                            |   9 +-
 voxygen/src/menu/server_info/mod.rs           |   3 +-
 voxygen/src/render/error.rs                   |  15 +-
 voxygen/src/render/renderer.rs                |   2 +-
 .../src/render/renderer/pipeline_creation.rs  | 161 ++++++++++--------
 voxygen/src/render/texture.rs                 |   2 +-
 8 files changed, 173 insertions(+), 113 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 64623d09aa..35a2472712 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3149,9 +3149,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3635,9 +3635,8 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61d829abac9f5230a85d8cc83ec0879b4c09790208ae25b5ea031ef84562e071"
+version = "0.14.2"
+source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
 dependencies = [
  "bit-set",
  "bitflags 2.4.0",
@@ -3646,6 +3645,7 @@ dependencies = [
  "indexmap 2.0.0",
  "log",
  "num-traits",
+ "petgraph 0.6.4",
  "pp-rs",
  "rustc-hash",
  "serde",
@@ -5218,6 +5218,15 @@ version = "0.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "082f11ffa03bbef6c2c6ea6bea1acafaade2fd9050ae0234ab44a2153742b058"
 
+[[package]]
+name = "roxmltree"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b"
+dependencies = [
+ "xmlparser",
+]
+
 [[package]]
 name = "rstar"
 version = "0.10.0"
@@ -5667,6 +5676,25 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "shaderc"
+version = "0.8.0"
+source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
+dependencies = [
+ "libc",
+ "shaderc-sys",
+]
+
+[[package]]
+name = "shaderc-sys"
+version = "0.8.0"
+source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
+dependencies = [
+ "cmake",
+ "libc",
+ "roxmltree",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.4"
@@ -7268,6 +7296,7 @@ dependencies = [
  "rodio",
  "ron",
  "serde",
+ "shaderc",
  "slab",
  "specs",
  "strum",
@@ -7490,9 +7519,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -7500,9 +7529,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
 dependencies = [
  "bumpalo",
  "log",
@@ -7550,9 +7579,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
 dependencies = [
  "quote 1.0.33",
  "wasm-bindgen-macro-support",
@@ -7560,9 +7589,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2 1.0.66",
  "quote 1.0.33",
@@ -7573,9 +7602,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "wasm-encoder"
@@ -7848,9 +7877,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7869,8 +7898,7 @@ dependencies = [
 [[package]]
 name = "wgpu"
 version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24"
+source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
 dependencies = [
  "arrayvec",
  "cfg-if 1.0.0",
@@ -7878,7 +7906,7 @@ dependencies = [
  "js-sys",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
  "profiling",
  "raw-window-handle 0.5.2",
  "serde",
@@ -7894,9 +7922,8 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "837e02ddcdc6d4a9b56ba4598f7fd4202a7699ab03f6ef4dcdebfad2c966aea6"
+version = "0.18.1"
+source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
 dependencies = [
  "arrayvec",
  "bit-vec",
@@ -7904,7 +7931,7 @@ dependencies = [
  "codespan-reporting",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
  "profiling",
  "raw-window-handle 0.5.2",
  "ron",
@@ -7919,9 +7946,8 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e30b9a8155c83868e82a8c5d3ce899de6c3961d2ef595de8fc168a1677fc2d8"
+version = "0.18.1"
+source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -7940,13 +7966,13 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.0",
+ "libloading 0.7.4",
  "log",
  "metal",
  "naga",
  "objc",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
  "profiling",
  "range-alloc",
  "raw-window-handle 0.5.2",
@@ -7973,8 +7999,7 @@ dependencies = [
 [[package]]
 name = "wgpu-types"
 version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd"
+source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
 dependencies = [
  "bitflags 2.4.0",
  "js-sys",
@@ -8455,6 +8480,12 @@ version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"
 
+[[package]]
+name = "xmlparser"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
+
 [[package]]
 name = "yasna"
 version = "0.5.2"
diff --git a/Cargo.toml b/Cargo.toml
index 717cea797c..2e67774794 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -162,6 +162,7 @@ vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986
 # ntapi 3.7 fails to compile under windows due to the bug https://github.com/MSxDOS/ntapi/pull/12
 ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "9f56b149c9e25796739157c0fce3e0007a7de6eb" }
 shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" }
+wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "daedf03f0617aab6b3ab7380132dc9cb07f62d32" }
 
 # [patch."https://github.com/gfx-rs/gfx"]
 # gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 0d468e8ccc..d3a6eac248 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -29,13 +29,14 @@ tracy = ["common-frontend/tracy", "client/tracy"]
 tracy-memory = ["tracy"] # enables heap profiling with tracy
 plugins = ["client/plugins", "common-assets/plugins"]
 egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend", "egui_winit_platform"]
+shaderc-from-source = ["shaderc/build-from-source"]
 discord = ["discord-sdk"]
 bin_img-export = ["common-assets"]
 
 # We don't ship egui with published release builds so a separate feature is required that excludes it.
 default-publish = ["singleplayer", "native-dialog", "plugins", "discord", "simd"]
 # Temp for bug on current wgpu version that has access violation in vulkan when constructing egui pipeline
-default-no-egui = ["default-publish", "hot-reloading"]
+default-no-egui = ["default-publish", "hot-reloading", "shaderc-from-source"]
 default = ["default-no-egui", "egui-ui"]
 
 [dependencies]
@@ -56,9 +57,13 @@ voxygen-egui = {package = "veloren-voxygen-egui", path = "egui", optional = true
 
 # Graphics
 winit = {version = "0.28.6", features = ["serde"]}
-wgpu = { version = "=0.18.0", features = ["trace", "glsl"] }
+# naga has an issue for spirv in wgpu 18.0
+wgpu = { version = "=0.18.0", default-features = false, features = ["trace", "spirv", "glsl"] }
 wgpu-profiler = "0.15.0"
 bytemuck = { version="1.7", features=["derive"] }
+# shaderc = "0.8.0"
+# Working around a current bug in shaderc that causes it to use the system installation even if we specify compile from source
+shaderc = { git = "https://github.com/pythonesque/shaderc-rs", rev = "f2605a02062834019bedff911aee2fd2998c49f9" }
 # cmake crate used by shaderc, newer version 0.1.46 uses a new cmake command that is not available in our CI cmake version
 # see https://github.com/alexcrichton/cmake-rs/issues/131
 cmake = "=0.1.45"
diff --git a/voxygen/src/menu/server_info/mod.rs b/voxygen/src/menu/server_info/mod.rs
index 9ff08f298d..b37afe2bdd 100644
--- a/voxygen/src/menu/server_info/mod.rs
+++ b/voxygen/src/menu/server_info/mod.rs
@@ -233,7 +233,8 @@ impl PlayState for ServerInfoState {
 
     fn render(&self, drawer: &mut Drawer<'_>, _: &Settings) {
         // Draw the UI to the screen.
-        let mut third_pass = drawer.third_pass();
+        let mut third_pass = drawer.prepare_third_pass();
+        let mut third_pass = third_pass.drawer();
         if let Some(mut ui_drawer) = third_pass.draw_ui() {
             self.ui.render(&mut ui_drawer);
         };
diff --git a/voxygen/src/render/error.rs b/voxygen/src/render/error.rs
index 01cd27fea3..b55cf16d4c 100644
--- a/voxygen/src/render/error.rs
+++ b/voxygen/src/render/error.rs
@@ -7,7 +7,7 @@ pub enum RenderError {
     CustomError(String),
     CouldNotFindAdapter,
     ErrorInitializingCompiler,
-    // ShaderError(String, shaderc::Error),
+    ShaderError(String, shaderc::Error),
     ProfilerCreationError(wgpu_profiler::CreationError),
 }
 
@@ -27,10 +27,10 @@ impl fmt::Debug for RenderError {
             Self::CustomError(err) => f.debug_tuple("CustomError").field(err).finish(),
             Self::CouldNotFindAdapter => f.debug_tuple("CouldNotFindAdapter").finish(),
             Self::ErrorInitializingCompiler => f.debug_tuple("ErrorInitializingCompiler").finish(),
-            // Self::ShaderError(shader_name, err) => write!(
-            //     f,
-            //     "\"{shader_name}\" shader failed to compile due to the following error: {err}",
-            // ),
+            Self::ShaderError(shader_name, err) => write!(
+                f,
+                "\"{shader_name}\" shader failed to compile due to the following error: {err}",
+            ),
             RenderError::ProfilerCreationError(err) => write!(f, "Profiler creation error: {err}"),
         }
     }
@@ -47,3 +47,8 @@ impl From<wgpu::BufferAsyncError> for RenderError {
 impl From<wgpu::SurfaceError> for RenderError {
     fn from(err: wgpu::SurfaceError) -> Self { Self::SurfaceError(err) }
 }
+impl From<(&str, shaderc::Error)> for RenderError {
+    fn from((shader_name, err): (&str, shaderc::Error)) -> Self {
+        Self::ShaderError(shader_name.into(), err)
+    }
+}
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index 1c538f7289..ff15ff398a 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -550,7 +550,7 @@ impl Renderer {
         .map_err(RenderError::ProfilerCreationError)?;
 
         #[cfg(feature = "egui-ui")]
-        let egui_renderpass = egui_wgpu_backend::RenderPass::new(&*device, format, 1);
+        let egui_renderpass = egui_wgpu_backend::RenderPass::new(&device, format, 1);
 
         Ok(Self {
             device,
diff --git a/voxygen/src/render/renderer/pipeline_creation.rs b/voxygen/src/render/renderer/pipeline_creation.rs
index c991255356..680cc272a2 100644
--- a/voxygen/src/render/renderer/pipeline_creation.rs
+++ b/voxygen/src/render/renderer/pipeline_creation.rs
@@ -164,6 +164,7 @@ impl ShaderModules {
         has_shadow_views: bool,
     ) -> Result<Self, RenderError> {
         prof_span!(_guard, "ShaderModules::new");
+        use shaderc::{CompileOptions, Compiler, OptimizationLevel, ResolvedInclude, ShaderKind};
 
         let constants = shaders.get("include.constants").unwrap();
         let globals = shaders.get("include.globals").unwrap();
@@ -279,32 +280,45 @@ impl ShaderModules {
             })
             .unwrap();
 
-        let defines = wgpu::naga::FastHashMap::from_iter([
-            ("constants.glsl".to_string(), constants.clone()),
-            ("globals.glsl".to_string(), globals.0.to_owned()),
-            ("shadows.glsl".to_string(), shadows.0.to_owned()),
-            (
-                "rain_occlusion.glsl".to_string(),
-                rain_occlusion.0.to_owned(),
-            ),
-            ("sky.glsl".to_string(), sky.0.to_owned()),
-            ("light.glsl".to_string(), light.0.to_owned()),
-            ("srgb.glsl".to_string(), srgb.0.to_owned()),
-            ("random.glsl".to_string(), random.0.to_owned()),
-            ("lod.glsl".to_string(), lod.0.to_owned()),
-            ("anti-aliasing.glsl".to_string(), anti_alias.0.to_owned()),
-            ("cloud.glsl".to_string(), cloud.0.to_owned()),
-            ("point_glow.glsl".to_string(), point_glow.0.to_owned()),
-            ("fxaa.glsl".to_string(), fxaa.0.to_owned()),
-        ]);
+        let mut compiler = Compiler::new().ok_or(RenderError::ErrorInitializingCompiler)?;
+        let mut options = CompileOptions::new().ok_or(RenderError::ErrorInitializingCompiler)?;
+        options.set_optimization_level(OptimizationLevel::Zero);
+        options.set_forced_version_profile(430, shaderc::GlslProfile::Core);
+        // options.set_generate_debug_info();
+        options.set_include_callback(move |name, _, shader_name, _| {
+            Ok(ResolvedInclude {
+                resolved_name: name.to_string(),
+                content: match name {
+                    "constants.glsl" => constants.clone(),
+                    "globals.glsl" => globals.0.to_owned(),
+                    "shadows.glsl" => shadows.0.to_owned(),
+                    "rain_occlusion.glsl" => rain_occlusion.0.to_owned(),
+                    "sky.glsl" => sky.0.to_owned(),
+                    "light.glsl" => light.0.to_owned(),
+                    "srgb.glsl" => srgb.0.to_owned(),
+                    "random.glsl" => random.0.to_owned(),
+                    "lod.glsl" => lod.0.to_owned(),
+                    "anti-aliasing.glsl" => anti_alias.0.to_owned(),
+                    "cloud.glsl" => cloud.0.to_owned(),
+                    "point_glow.glsl" => point_glow.0.to_owned(),
+                    "fxaa.glsl" => fxaa.0.to_owned(),
+                    other => {
+                        return Err(format!(
+                            "Include {} in {} is not defined",
+                            other, shader_name
+                        ));
+                    },
+                },
+            })
+        });
 
-        let create_shader = |name, stage| {
+        let mut create_shader = |name, kind| {
             let glsl = &shaders
                 .get(name)
                 .unwrap_or_else(|| panic!("Can't retrieve shader: {}", name))
                 .0;
             let file_name = format!("{}.glsl", name);
-            create_shader_module(device, defines.clone(), glsl, stage, &file_name)
+            create_shader_module(device, &mut compiler, glsl, kind, &file_name, &options)
         };
 
         let selected_fluid_shader = ["fluid-frag.", match pipeline_modes.fluid {
@@ -313,69 +327,68 @@ impl ShaderModules {
         }]
         .concat();
 
-        use wgpu::naga::ShaderStage;
         Ok(Self {
-            skybox_vert: create_shader("skybox-vert", ShaderStage::Vertex)?,
-            skybox_frag: create_shader("skybox-frag", ShaderStage::Fragment)?,
-            debug_vert: create_shader("debug-vert", ShaderStage::Vertex)?,
-            debug_frag: create_shader("debug-frag", ShaderStage::Fragment)?,
-            figure_vert: create_shader("figure-vert", ShaderStage::Vertex)?,
-            figure_frag: create_shader("figure-frag", ShaderStage::Fragment)?,
-            terrain_vert: create_shader("terrain-vert", ShaderStage::Vertex)?,
-            terrain_frag: create_shader("terrain-frag", ShaderStage::Fragment)?,
-            fluid_vert: create_shader("fluid-vert", ShaderStage::Vertex)?,
-            fluid_frag: create_shader(&selected_fluid_shader, ShaderStage::Fragment)?,
-            sprite_vert: create_shader("sprite-vert", ShaderStage::Vertex)?,
-            sprite_frag: create_shader("sprite-frag", ShaderStage::Fragment)?,
-            lod_object_vert: create_shader("lod-object-vert", ShaderStage::Vertex)?,
-            lod_object_frag: create_shader("lod-object-frag", ShaderStage::Fragment)?,
-            particle_vert: create_shader("particle-vert", ShaderStage::Vertex)?,
-            particle_frag: create_shader("particle-frag", ShaderStage::Fragment)?,
-            rope_vert: create_shader("rope-vert", ShaderStage::Vertex)?,
-            rope_frag: create_shader("rope-frag", ShaderStage::Fragment)?,
-            trail_vert: create_shader("trail-vert", ShaderStage::Vertex)?,
-            trail_frag: create_shader("trail-frag", ShaderStage::Fragment)?,
-            ui_vert: create_shader("ui-vert", ShaderStage::Vertex)?,
-            ui_frag: create_shader("ui-frag", ShaderStage::Fragment)?,
-            premultiply_alpha_vert: create_shader("premultiply-alpha-vert", ShaderStage::Vertex)?,
-            premultiply_alpha_frag: create_shader("premultiply-alpha-frag", ShaderStage::Fragment)?,
-            lod_terrain_vert: create_shader("lod-terrain-vert", ShaderStage::Vertex)?,
-            lod_terrain_frag: create_shader("lod-terrain-frag", ShaderStage::Fragment)?,
-            clouds_vert: create_shader("clouds-vert", ShaderStage::Vertex)?,
-            clouds_frag: create_shader("clouds-frag", ShaderStage::Fragment)?,
+            skybox_vert: create_shader("skybox-vert", ShaderKind::Vertex)?,
+            skybox_frag: create_shader("skybox-frag", ShaderKind::Fragment)?,
+            debug_vert: create_shader("debug-vert", ShaderKind::Vertex)?,
+            debug_frag: create_shader("debug-frag", ShaderKind::Fragment)?,
+            figure_vert: create_shader("figure-vert", ShaderKind::Vertex)?,
+            figure_frag: create_shader("figure-frag", ShaderKind::Fragment)?,
+            terrain_vert: create_shader("terrain-vert", ShaderKind::Vertex)?,
+            terrain_frag: create_shader("terrain-frag", ShaderKind::Fragment)?,
+            fluid_vert: create_shader("fluid-vert", ShaderKind::Vertex)?,
+            fluid_frag: create_shader(&selected_fluid_shader, ShaderKind::Fragment)?,
+            sprite_vert: create_shader("sprite-vert", ShaderKind::Vertex)?,
+            sprite_frag: create_shader("sprite-frag", ShaderKind::Fragment)?,
+            lod_object_vert: create_shader("lod-object-vert", ShaderKind::Vertex)?,
+            lod_object_frag: create_shader("lod-object-frag", ShaderKind::Fragment)?,
+            particle_vert: create_shader("particle-vert", ShaderKind::Vertex)?,
+            particle_frag: create_shader("particle-frag", ShaderKind::Fragment)?,
+            rope_vert: create_shader("rope-vert", ShaderKind::Vertex)?,
+            rope_frag: create_shader("rope-frag", ShaderKind::Fragment)?,
+            trail_vert: create_shader("trail-vert", ShaderKind::Vertex)?,
+            trail_frag: create_shader("trail-frag", ShaderKind::Fragment)?,
+            ui_vert: create_shader("ui-vert", ShaderKind::Vertex)?,
+            ui_frag: create_shader("ui-frag", ShaderKind::Fragment)?,
+            premultiply_alpha_vert: create_shader("premultiply-alpha-vert", ShaderKind::Vertex)?,
+            premultiply_alpha_frag: create_shader("premultiply-alpha-frag", ShaderKind::Fragment)?,
+            lod_terrain_vert: create_shader("lod-terrain-vert", ShaderKind::Vertex)?,
+            lod_terrain_frag: create_shader("lod-terrain-frag", ShaderKind::Fragment)?,
+            clouds_vert: create_shader("clouds-vert", ShaderKind::Vertex)?,
+            clouds_frag: create_shader("clouds-frag", ShaderKind::Fragment)?,
             dual_downsample_filtered_frag: create_shader(
                 "dual-downsample-filtered-frag",
-                ShaderStage::Fragment,
+                ShaderKind::Fragment,
             )?,
-            dual_downsample_frag: create_shader("dual-downsample-frag", ShaderStage::Fragment)?,
-            dual_upsample_frag: create_shader("dual-upsample-frag", ShaderStage::Fragment)?,
-            postprocess_vert: create_shader("postprocess-vert", ShaderStage::Vertex)?,
-            postprocess_frag: create_shader("postprocess-frag", ShaderStage::Fragment)?,
-            blit_vert: create_shader("blit-vert", ShaderStage::Vertex)?,
-            blit_frag: create_shader("blit-frag", ShaderStage::Fragment)?,
+            dual_downsample_frag: create_shader("dual-downsample-frag", ShaderKind::Fragment)?,
+            dual_upsample_frag: create_shader("dual-upsample-frag", ShaderKind::Fragment)?,
+            postprocess_vert: create_shader("postprocess-vert", ShaderKind::Vertex)?,
+            postprocess_frag: create_shader("postprocess-frag", ShaderKind::Fragment)?,
+            blit_vert: create_shader("blit-vert", ShaderKind::Vertex)?,
+            blit_frag: create_shader("blit-frag", ShaderKind::Fragment)?,
             point_light_shadows_vert: create_shader(
                 "point-light-shadows-vert",
-                ShaderStage::Vertex,
+                ShaderKind::Vertex,
             )?,
             light_shadows_directed_vert: create_shader(
                 "light-shadows-directed-vert",
-                ShaderStage::Vertex,
+                ShaderKind::Vertex,
             )?,
             light_shadows_figure_vert: create_shader(
                 "light-shadows-figure-vert",
-                ShaderStage::Vertex,
+                ShaderKind::Vertex,
             )?,
             light_shadows_debug_vert: create_shader(
                 "light-shadows-debug-vert",
-                ShaderStage::Vertex,
+                ShaderKind::Vertex,
             )?,
             rain_occlusion_directed_vert: create_shader(
                 "rain-occlusion-directed-vert",
-                ShaderStage::Vertex,
+                ShaderKind::Vertex,
             )?,
             rain_occlusion_figure_vert: create_shader(
                 "rain-occlusion-figure-vert",
-                ShaderStage::Vertex,
+                ShaderKind::Vertex,
             )?,
         })
     }
@@ -383,14 +396,19 @@ impl ShaderModules {
 
 fn create_shader_module(
     device: &wgpu::Device,
-    defines: wgpu::naga::FastHashMap<String, String>,
+    compiler: &mut shaderc::Compiler,
     source: &str,
-    stage: wgpu::naga::ShaderStage,
+    kind: shaderc::ShaderKind,
     file_name: &str,
+    options: &shaderc::CompileOptions,
 ) -> Result<wgpu::ShaderModule, RenderError> {
     prof_span!(_guard, "create_shader_modules");
     use std::borrow::Cow;
 
+    let spv = compiler
+        .compile_into_spirv(source, kind, file_name, "main", Some(options))
+        .map_err(|e| (file_name, e))?;
+
     // Uncomment me to dump shaders to files
     //
     // std::fs::create_dir_all("dumpped-shaders").expect("Couldn't create shader
@@ -405,14 +423,13 @@ fn create_shader_module(
     //     .expect("Couldn't write shader out");
 
     // let label = [file_name, "\n\n", source].concat();
-    Ok(device.create_shader_module(wgpu::ShaderModuleDescriptor {
-        label: Some(file_name),
-        source: wgpu::ShaderSource::Glsl {
-            shader: Cow::Borrowed(source),
-            stage,
-            defines,
-        },
-    }))
+    #[allow(unsafe_code)]
+    Ok(unsafe {
+        device.create_shader_module_unchecked(wgpu::ShaderModuleDescriptor {
+            label: Some(file_name),
+            source: wgpu::ShaderSource::SpirV(Cow::Borrowed(spv.as_binary())),
+        })
+    })
 }
 
 /// Things needed to create a pipeline
diff --git a/voxygen/src/render/texture.rs b/voxygen/src/render/texture.rs
index 1a4a52e6a3..82f9a96e27 100644
--- a/voxygen/src/render/texture.rs
+++ b/voxygen/src/render/texture.rs
@@ -195,7 +195,7 @@ impl Texture {
     /// Update a texture with the given data (used for updating the glyph cache
     /// texture).
     pub fn update(&self, queue: &wgpu::Queue, offset: [u32; 2], size: [u32; 2], data: &[u8]) {
-        let bytes_per_pixel = self.format.block_size(None).unwrap() as u32;
+        let bytes_per_pixel = self.format.block_size(None).unwrap();
 
         debug_assert_eq!(
             data.len(),

From 00f527fe8b8f6985513ee59d3965224162d5c235 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sun, 7 Jan 2024 23:51:44 +0100
Subject: [PATCH 04/24] fix gl

---
 Cargo.lock | 10 +++++-----
 Cargo.toml |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 35a2472712..a255f3e8c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3636,7 +3636,7 @@ dependencies = [
 [[package]]
 name = "naga"
 version = "0.14.2"
-source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
+source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
 dependencies = [
  "bit-set",
  "bitflags 2.4.0",
@@ -7898,7 +7898,7 @@ dependencies = [
 [[package]]
 name = "wgpu"
 version = "0.18.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
+source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
 dependencies = [
  "arrayvec",
  "cfg-if 1.0.0",
@@ -7923,7 +7923,7 @@ dependencies = [
 [[package]]
 name = "wgpu-core"
 version = "0.18.1"
-source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
+source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
 dependencies = [
  "arrayvec",
  "bit-vec",
@@ -7947,7 +7947,7 @@ dependencies = [
 [[package]]
 name = "wgpu-hal"
 version = "0.18.1"
-source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
+source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -7999,7 +7999,7 @@ dependencies = [
 [[package]]
 name = "wgpu-types"
 version = "0.18.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=daedf03f0617aab6b3ab7380132dc9cb07f62d32#daedf03f0617aab6b3ab7380132dc9cb07f62d32"
+source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
 dependencies = [
  "bitflags 2.4.0",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 2e67774794..4c54099f05 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -162,7 +162,9 @@ vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986
 # ntapi 3.7 fails to compile under windows due to the bug https://github.com/MSxDOS/ntapi/pull/12
 ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "9f56b149c9e25796739157c0fce3e0007a7de6eb" }
 shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" }
-wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "daedf03f0617aab6b3ab7380132dc9cb07f62d32" }
+# This is needed because of an issue with spirv & naga in wgpu 0.18, and there's an issue
+# with uint in uniforms for gl.
+wgpu = { git = "https://github.com/IsseW/wgpu", rev = "96dc8b317" }
 
 # [patch."https://github.com/gfx-rs/gfx"]
 # gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }

From 82989979a6f2f511d8f0a085d7de7123048b609c Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Mon, 8 Jan 2024 22:16:10 +0100
Subject: [PATCH 05/24] try to fix windows build

---
 Cargo.lock         | 74 +++++++++++++++-------------------------------
 voxygen/Cargo.toml |  4 +--
 2 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a255f3e8c3..d1361e411b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -903,16 +903,6 @@ dependencies = [
  "objc_id",
 ]
 
-[[package]]
-name = "clipboard_macos"
-version = "0.1.0"
-source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
-dependencies = [
- "objc",
- "objc-foundation",
- "objc_id",
-]
-
 [[package]]
 name = "clipboard_wayland"
 version = "0.2.0"
@@ -922,14 +912,6 @@ dependencies = [
  "smithay-clipboard",
 ]
 
-[[package]]
-name = "clipboard_wayland"
-version = "0.2.0"
-source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
-dependencies = [
- "smithay-clipboard",
-]
-
 [[package]]
 name = "clipboard_x11"
 version = "0.4.0"
@@ -940,15 +922,6 @@ dependencies = [
  "x11rb 0.9.0",
 ]
 
-[[package]]
-name = "clipboard_x11"
-version = "0.4.0"
-source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
-dependencies = [
- "thiserror",
- "x11rb 0.9.0",
-]
-
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
@@ -2871,12 +2844,12 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.4.0"
-source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
+source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
 
 [[package]]
 name = "iced_futures"
 version = "0.3.0"
-source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
+source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
 dependencies = [
  "futures",
  "log",
@@ -2886,7 +2859,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.2.0"
-source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
+source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
 dependencies = [
  "bytemuck",
  "glam",
@@ -2899,7 +2872,7 @@ dependencies = [
 [[package]]
 name = "iced_native"
 version = "0.4.0"
-source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
+source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -2911,7 +2884,7 @@ dependencies = [
 [[package]]
 name = "iced_style"
 version = "0.3.0"
-source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
+source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
 dependencies = [
  "iced_core",
 ]
@@ -2919,7 +2892,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.3.0"
-source = "git+https://github.com/JCapucho/iced?branch=winit-updates#40184db6ff7d197cb40243c51284276e52de5070"
+source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa"
 dependencies = [
  "iced_futures",
  "iced_graphics",
@@ -2927,7 +2900,7 @@ dependencies = [
  "log",
  "thiserror",
  "winapi",
- "window_clipboard 0.2.3",
+ "window_clipboard 0.3.0",
  "winit",
 ]
 
@@ -8064,19 +8037,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "window_clipboard"
-version = "0.2.3"
-source = "git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d#1392da8339c8aebb9849d00eb7383a73ed076f1d"
-dependencies = [
- "clipboard-win 4.5.0",
- "clipboard_macos 0.1.0 (git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d)",
- "clipboard_wayland 0.2.0 (git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d)",
- "clipboard_x11 0.4.0 (git+https://github.com/TobTobXX/window_clipboard.git?rev=1392da8339c8aebb9849d00eb7383a73ed076f1d)",
- "raw-window-handle 0.5.2",
- "thiserror",
-]
-
 [[package]]
 name = "window_clipboard"
 version = "0.2.4"
@@ -8084,13 +8044,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d"
 dependencies = [
  "clipboard-win 4.5.0",
- "clipboard_macos 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clipboard_wayland 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clipboard_x11 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clipboard_macos",
+ "clipboard_wayland",
+ "clipboard_x11",
  "raw-window-handle 0.3.4",
  "thiserror",
 ]
 
+[[package]]
+name = "window_clipboard"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d"
+dependencies = [
+ "clipboard-win 4.5.0",
+ "clipboard_macos",
+ "clipboard_wayland",
+ "clipboard_x11",
+ "raw-window-handle 0.5.2",
+ "thiserror",
+]
+
 [[package]]
 name = "windows"
 version = "0.48.0"
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index d3a6eac248..40c64ae69d 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -72,8 +72,8 @@ cmake = "=0.1.45"
 conrod_core = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta_0.7"}
 conrod_winit = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta_0.7"}
 euc = "0.5.0"
-iced = {package = "iced_native", git = "https://github.com/JCapucho/iced", branch = "winit-updates"}
-iced_winit = {git = "https://github.com/JCapucho/iced", branch = "winit-updates"}
+iced = {package = "iced_native", git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"}
+iced_winit = {git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"}
 window_clipboard = "0.2"
 glyph_brush = "0.7.0"
 # https://gitlab.com/Frinksy/keyboard-keynames/-/merge_requests/8

From b7a56e895a1d2df42bff93d142d4ef0deb0a65fe Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Thu, 18 Jan 2024 00:57:01 +0100
Subject: [PATCH 06/24] Only show available present modes in graphic settings

---
 assets/voxygen/i18n/en/hud/settings.ftl  |  1 +
 voxygen/src/hud/settings_window/video.rs | 18 ++++++----------
 voxygen/src/render/mod.rs                | 27 ++++++++++++++++++++++++
 voxygen/src/render/renderer.rs           | 27 +++++++++++++++++++++---
 4 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/assets/voxygen/i18n/en/hud/settings.ftl b/assets/voxygen/i18n/en/hud/settings.ftl
index b61b457e7d..c5a4866dbf 100644
--- a/assets/voxygen/i18n/en/hud/settings.ftl
+++ b/assets/voxygen/i18n/en/hud/settings.ftl
@@ -72,6 +72,7 @@ hud-settings-maximum_fps = Maximum FPS
 hud-settings-background_fps = Background FPS
 hud-settings-present_mode = Present Mode
 hud-settings-present_mode-vsync_capped = Vsync capped
+hud-settings-present_mode-vsync_adaptive = Adaptive vsync
 hud-settings-present_mode-vsync_uncapped = Vsync uncapped
 hud-settings-present_mode-vsync_off = Vsync off
 hud-settings-fov = Field of View (deg)
diff --git a/voxygen/src/hud/settings_window/video.rs b/voxygen/src/hud/settings_window/video.rs
index ae6dda8127..577b98051a 100644
--- a/voxygen/src/hud/settings_window/video.rs
+++ b/voxygen/src/hud/settings_window/video.rs
@@ -7,7 +7,7 @@ use crate::{
     },
     render::{
         AaMode, BloomConfig, BloomFactor, BloomMode, CloudMode, FluidMode, LightingMode,
-        PresentMode, ReflectionMode, RenderMode, ShadowMapMode, ShadowMode, UpscaleMode,
+        ReflectionMode, RenderMode, ShadowMapMode, ShadowMode, UpscaleMode,
     },
     session::settings_change::Graphics as GraphicsChange,
     settings::{Fps, GraphicsSettings},
@@ -659,17 +659,11 @@ impl<'a> Widget for Video<'a> {
             .color(TEXT_COLOR)
             .set(state.ids.present_mode_text, ui);
 
-        let mode_list = [
-            PresentMode::Fifo,
-            PresentMode::Mailbox,
-            PresentMode::Immediate,
-        ];
-        let mode_label_list = [
-            "hud-settings-present_mode-vsync_capped",
-            "hud-settings-present_mode-vsync_uncapped",
-            "hud-settings-present_mode-vsync_off",
-        ]
-        .map(|k| self.localized_strings.get_msg(k));
+        let mode_list = self.global_state.window.renderer().present_modes();
+        let mode_label_list = mode_list
+            .iter()
+            .map(|mode| self.localized_strings.get_msg(mode.localize()))
+            .collect::<Vec<_>>();
 
         // Get which present mode is currently active
         let selected = mode_list
diff --git a/voxygen/src/render/mod.rs b/voxygen/src/render/mod.rs
index 8386bff56f..222b7f1dd8 100644
--- a/voxygen/src/render/mod.rs
+++ b/voxygen/src/render/mod.rs
@@ -292,21 +292,48 @@ impl Default for UpscaleMode {
 pub enum PresentMode {
     Mailbox,
     Immediate,
+    FifoRelaxed,
     #[default]
     #[serde(other)]
     Fifo, // has to be last for `#[serde(other)]`
 }
 
+impl PresentMode {
+    pub fn localize(&self) -> &'static str {
+        match self {
+            Self::Fifo => "hud-settings-present_mode-vsync_capped",
+            Self::FifoRelaxed => "hud-settings-present_mode-vsync_adaptive",
+            Self::Mailbox => "hud-settings-present_mode-vsync_uncapped",
+            Self::Immediate => "hud-settings-present_mode-vsync_off",
+        }
+    }
+}
+
 impl From<PresentMode> for wgpu::PresentMode {
     fn from(mode: PresentMode) -> Self {
         match mode {
             PresentMode::Fifo => wgpu::PresentMode::Fifo,
+            PresentMode::FifoRelaxed => wgpu::PresentMode::FifoRelaxed,
             PresentMode::Mailbox => wgpu::PresentMode::Mailbox,
             PresentMode::Immediate => wgpu::PresentMode::Immediate,
         }
     }
 }
 
+impl TryFrom<wgpu::PresentMode> for PresentMode {
+    type Error = ();
+
+    fn try_from(mode: wgpu::PresentMode) -> Result<Self, ()> {
+        match mode {
+            wgpu::PresentMode::Fifo => Ok(PresentMode::Fifo),
+            wgpu::PresentMode::FifoRelaxed => Ok(PresentMode::FifoRelaxed),
+            wgpu::PresentMode::Mailbox => Ok(PresentMode::Mailbox),
+            wgpu::PresentMode::Immediate => Ok(PresentMode::Immediate),
+            _ => Err(()),
+        }
+    }
+}
+
 /// Bloom factor
 /// Controls fraction of output image luminosity that is blurred bloom
 #[derive(Default, PartialEq, Clone, Copy, Debug, Serialize, Deserialize)]
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index ff15ff398a..05f0f0c13c 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -28,8 +28,8 @@ use super::{
         terrain, ui, GlobalsBindGroup, GlobalsLayouts, ShadowTexturesBindGroup,
     },
     texture::Texture,
-    AddressMode, FilterMode, OtherModes, PipelineModes, RenderError, RenderMode, ShadowMapMode,
-    ShadowMode, Vertex,
+    AddressMode, FilterMode, OtherModes, PipelineModes, PresentMode, RenderError, RenderMode,
+    ShadowMapMode, ShadowMode, Vertex,
 };
 use common::assets::{self, AssetExt, AssetHandle, ReloadWatcher};
 use common_base::span;
@@ -135,6 +135,7 @@ enum State {
 pub struct Renderer {
     device: Arc<wgpu::Device>,
     queue: wgpu::Queue,
+    adapter: wgpu::Adapter,
     surface: wgpu::Surface,
     surface_config: wgpu::SurfaceConfiguration,
 
@@ -350,12 +351,21 @@ impl Renderer {
         let format = surface_capabilities.formats[0];
         info!("Using {:?} as the surface format", format);
 
+        let present_mode = other_modes.present_mode.into();
         let surface_config = wgpu::SurfaceConfiguration {
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
             format,
             width: dims.width,
             height: dims.height,
-            present_mode: other_modes.present_mode.into(),
+            present_mode: if surface_capabilities.present_modes.contains(&present_mode) {
+                present_mode
+            } else {
+                *surface_capabilities
+                    .present_modes
+                    .iter()
+                    .find(|mode| PresentMode::try_from(**mode).is_ok())
+                    .expect("There should never be no supported present modes")
+            },
             alpha_mode: wgpu::CompositeAlphaMode::Opaque,
             view_formats: Vec::new(),
         };
@@ -555,6 +565,7 @@ impl Renderer {
         Ok(Self {
             device,
             queue,
+            adapter,
             surface,
             surface_config,
 
@@ -675,6 +686,16 @@ impl Renderer {
     /// Get the pipelines mode.
     pub fn pipeline_modes(&self) -> &PipelineModes { &self.pipeline_modes }
 
+    /// Get the supported present modes.
+    pub fn present_modes(&self) -> Vec<PresentMode> {
+        self.surface
+            .get_capabilities(&self.adapter)
+            .present_modes
+            .into_iter()
+            .filter_map(|present_mode| PresentMode::try_from(present_mode).ok())
+            .collect()
+    }
+
     /// Get the current profiling times
     /// Nested timings immediately follow their parent
     /// Returns Vec<(how nested this timing is, label, length in seconds)>

From 02aa740f728187f9206ee499c459abf17ea36c18 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Thu, 18 Jan 2024 01:19:55 +0100
Subject: [PATCH 07/24] try fix changing settings for opengl + windows

---
 Cargo.lock | 10 +++++-----
 Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d1361e411b..61a0a1838b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3609,7 +3609,7 @@ dependencies = [
 [[package]]
 name = "naga"
 version = "0.14.2"
-source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
+source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0"
 dependencies = [
  "bit-set",
  "bitflags 2.4.0",
@@ -7871,7 +7871,7 @@ dependencies = [
 [[package]]
 name = "wgpu"
 version = "0.18.0"
-source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
+source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0"
 dependencies = [
  "arrayvec",
  "cfg-if 1.0.0",
@@ -7896,7 +7896,7 @@ dependencies = [
 [[package]]
 name = "wgpu-core"
 version = "0.18.1"
-source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
+source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0"
 dependencies = [
  "arrayvec",
  "bit-vec",
@@ -7920,7 +7920,7 @@ dependencies = [
 [[package]]
 name = "wgpu-hal"
 version = "0.18.1"
-source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
+source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -7972,7 +7972,7 @@ dependencies = [
 [[package]]
 name = "wgpu-types"
 version = "0.18.0"
-source = "git+https://github.com/IsseW/wgpu?rev=96dc8b317#96dc8b317a5ac9280f642f2de8082b8e8ddd66a1"
+source = "git+https://github.com/IsseW/wgpu?rev=5ea160164#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0"
 dependencies = [
  "bitflags 2.4.0",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 4c54099f05..d39712dcf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -164,7 +164,7 @@ ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "9f56b149c9e2579673
 shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" }
 # This is needed because of an issue with spirv & naga in wgpu 0.18, and there's an issue
 # with uint in uniforms for gl.
-wgpu = { git = "https://github.com/IsseW/wgpu", rev = "96dc8b317" }
+wgpu = { git = "https://github.com/IsseW/wgpu", rev = "5ea160164" }
 
 # [patch."https://github.com/gfx-rs/gfx"]
 # gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }

From 856c64c9eee89116e62b79a8e41b11bb65808454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Fri, 26 Jan 2024 12:31:56 +0100
Subject: [PATCH 08/24] smaller code cleanups, copy paste errors, or wrong
 merge resolutions fixed according to MR reviews

---
 .cargo/config                                 |  4 +--
 Cargo.lock                                    | 27 +------------------
 Cargo.toml                                    | 19 +------------
 voxygen/Cargo.toml                            |  3 +--
 voxygen/egui/src/admin.rs                     |  2 +-
 voxygen/src/render/error.rs                   |  1 +
 voxygen/src/render/pipelines/figure.rs        |  4 +--
 voxygen/src/render/pipelines/mod.rs           | 10 +++----
 .../src/render/pipelines/rain_occlusion.rs    |  2 +-
 voxygen/src/render/pipelines/rope.rs          |  6 ++---
 voxygen/src/render/pipelines/terrain.rs       |  8 +++---
 voxygen/src/render/pipelines/ui.rs            |  2 +-
 voxygen/src/render/renderer.rs                |  2 +-
 .../src/render/renderer/pipeline_creation.rs  |  1 +
 voxygen/src/window.rs                         | 12 ++++++---
 15 files changed, 33 insertions(+), 70 deletions(-)

diff --git a/.cargo/config b/.cargo/config
index c1c8be6a6c..87d684cbbf 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -25,8 +25,8 @@ tracy-server-debuginfo = "run --bin veloren-server-cli --features tracy,simd --p
 tracy-server-releasedebuginfo = "run --bin veloren-server-cli --features tracy,simd --profile releasedebuginfo"
 tracy-test-server = "run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow"
 # voxygen
-test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui"
-tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui --profile no_overflow"
+test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui,shaderc-from-source"
+tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui,shaderc-from-source --profile no_overflow"
 dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo"
 # misc
 swarm = "run --bin swarm --features client/bin_bot,client/tick_network --"
diff --git a/Cargo.lock b/Cargo.lock
index 61a0a1838b..c8cc9b8abf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2900,7 +2900,7 @@ dependencies = [
  "log",
  "thiserror",
  "winapi",
- "window_clipboard 0.3.0",
+ "window_clipboard",
  "winit",
 ]
 
@@ -4876,16 +4876,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
-[[package]]
-name = "raw-window-handle"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76"
-dependencies = [
- "libc",
- "raw-window-handle 0.4.3",
-]
-
 [[package]]
 name = "raw-window-handle"
 version = "0.4.3"
@@ -7294,7 +7284,6 @@ dependencies = [
  "veloren-world",
  "wgpu",
  "wgpu-profiler",
- "window_clipboard 0.2.4",
  "winit",
  "winres",
 ]
@@ -8037,20 +8026,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "window_clipboard"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d"
-dependencies = [
- "clipboard-win 4.5.0",
- "clipboard_macos",
- "clipboard_wayland",
- "clipboard_x11",
- "raw-window-handle 0.3.4",
- "thiserror",
-]
-
 [[package]]
 name = "window_clipboard"
 version = "0.3.0"
diff --git a/Cargo.toml b/Cargo.toml
index d39712dcf9..14ce84cf73 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -166,27 +166,10 @@ shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c
 # with uint in uniforms for gl.
 wgpu = { git = "https://github.com/IsseW/wgpu", rev = "5ea160164" }
 
-# [patch."https://github.com/gfx-rs/gfx"]
-# gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-# gfx-backend-empty = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-# gfx-backend-vulkan = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-# gfx-backend-gl = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-# gfx-backend-dx12 = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-# gfx-backend-dx11 = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-# gfx-backend-metal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" }
-
 # # use the latest fixes in naga (remove when updates trickle down to wgpu-rs)
 # naga = { git = "https://github.com/gfx-rs/naga.git", rev = "3a0f0144112ff621dd7f731bf455adf6cab19164" }
-# # use the latest fixes in gfx (remove when updates trickle down to wgpu-rs)
-# gfx-hal = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
-# gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
-# gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
-# gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
-# gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
-# gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
-# gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx.git", rev = "e305dcca3557923a6a8810162d8dd09cb45a43a6" }
-# keyboard-keynames = { git = "https://gitlab.com/Capucho/keyboard-keynames.git", rev = "7b1375ee4ea01d0e0b80c419cb27f0498e67df3a" }
 # naga = { path = "../naga" }
+# keyboard-keynames = { git = "https://gitlab.com/Capucho/keyboard-keynames.git", rev = "7b1375ee4ea01d0e0b80c419cb27f0498e67df3a" }
 
 # # Uncomment this to use a local fork of winit (for testing purposes)
 # winit = { path = "../winit" }
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 40c64ae69d..aa82390c51 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -58,7 +58,7 @@ voxygen-egui = {package = "veloren-voxygen-egui", path = "egui", optional = true
 # Graphics
 winit = {version = "0.28.6", features = ["serde"]}
 # naga has an issue for spirv in wgpu 18.0
-wgpu = { version = "=0.18.0", default-features = false, features = ["trace", "spirv", "glsl"] }
+wgpu = { version = "0.18.0", default-features = false, features = ["trace", "spirv", "glsl"] }
 wgpu-profiler = "0.15.0"
 bytemuck = { version="1.7", features=["derive"] }
 # shaderc = "0.8.0"
@@ -74,7 +74,6 @@ conrod_winit = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta
 euc = "0.5.0"
 iced = {package = "iced_native", git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"}
 iced_winit = {git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"}
-window_clipboard = "0.2"
 glyph_brush = "0.7.0"
 # https://gitlab.com/Frinksy/keyboard-keynames/-/merge_requests/8
 keyboard-keynames = { git = "https://gitlab.com/Imbris/keyboard-keynames.git", tag = "veloren-winit-0.28" }
diff --git a/voxygen/egui/src/admin.rs b/voxygen/egui/src/admin.rs
index 35c283098e..ddd2c26b32 100644
--- a/voxygen/egui/src/admin.rs
+++ b/voxygen/egui/src/admin.rs
@@ -108,7 +108,7 @@ fn draw_give_items(ui: &mut Ui, state: &mut AdminCommandState, egui_actions: &mu
         });
 }
 fn draw_spawn_entities(ui: &mut Ui, state: &mut AdminCommandState, egui_actions: &mut EguiActions) {
-    ui.spacing_mut().window_margin = Margin::symmetric(10.0, 10.0);
+    ui.spacing_mut().window_margin = Margin::same(10.0);
     Resize::default()
         .default_size([400.0, 200.0])
         .show(ui, |ui| {
diff --git a/voxygen/src/render/error.rs b/voxygen/src/render/error.rs
index b55cf16d4c..25c585a022 100644
--- a/voxygen/src/render/error.rs
+++ b/voxygen/src/render/error.rs
@@ -47,6 +47,7 @@ impl From<wgpu::BufferAsyncError> for RenderError {
 impl From<wgpu::SurfaceError> for RenderError {
     fn from(err: wgpu::SurfaceError) -> Self { Self::SurfaceError(err) }
 }
+
 impl From<(&str, shaderc::Error)> for RenderError {
     fn from((shader_name, err): (&str, shaderc::Error)) -> Self {
         Self::ShaderError(shader_name.into(), err)
diff --git a/voxygen/src/render/pipelines/figure.rs b/voxygen/src/render/pipelines/figure.rs
index 015067cba5..809ec2969b 100644
--- a/voxygen/src/render/pipelines/figure.rs
+++ b/voxygen/src/render/pipelines/figure.rs
@@ -286,7 +286,7 @@ impl AtlasData for FigureSpriteAtlasData {
             // col lights
             wgpu::BindGroupLayoutEntry {
                 binding: 0,
-                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -296,7 +296,7 @@ impl AtlasData for FigureSpriteAtlasData {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 1,
-                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
diff --git a/voxygen/src/render/pipelines/mod.rs b/voxygen/src/render/pipelines/mod.rs
index aaa676f560..fc87440c25 100644
--- a/voxygen/src/render/pipelines/mod.rs
+++ b/voxygen/src/render/pipelines/mod.rs
@@ -534,7 +534,7 @@ impl GlobalsLayouts {
             // clouds t_weather
             wgpu::BindGroupLayoutEntry {
                 binding: 12,
-                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -544,14 +544,14 @@ impl GlobalsLayouts {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 13,
-                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
             // rain occlusion
             wgpu::BindGroupLayoutEntry {
                 binding: 14,
-                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Buffer {
                     ty: wgpu::BufferBindingType::Uniform,
                     has_dynamic_offset: false,
@@ -608,7 +608,7 @@ impl GlobalsLayouts {
                 // Rain occlusion maps
                 wgpu::BindGroupLayoutEntry {
                     binding: 4,
-                    visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                    visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                     ty: wgpu::BindingType::Texture {
                         sample_type: wgpu::TextureSampleType::Depth,
                         view_dimension: wgpu::TextureViewDimension::D2,
@@ -618,7 +618,7 @@ impl GlobalsLayouts {
                 },
                 wgpu::BindGroupLayoutEntry {
                     binding: 5,
-                    visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                    visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                     ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Comparison),
                     count: None,
                 },
diff --git a/voxygen/src/render/pipelines/rain_occlusion.rs b/voxygen/src/render/pipelines/rain_occlusion.rs
index ed2bde4f20..8524a434d5 100644
--- a/voxygen/src/render/pipelines/rain_occlusion.rs
+++ b/voxygen/src/render/pipelines/rain_occlusion.rs
@@ -53,7 +53,7 @@ impl RainOcclusionLayout {
                 label: None,
                 entries: &[wgpu::BindGroupLayoutEntry {
                     binding: 0,
-                    visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                    visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                     ty: wgpu::BindingType::Buffer {
                         ty: wgpu::BufferBindingType::Uniform,
                         has_dynamic_offset: false,
diff --git a/voxygen/src/render/pipelines/rope.rs b/voxygen/src/render/pipelines/rope.rs
index 1777ebf174..d8081ab4ca 100644
--- a/voxygen/src/render/pipelines/rope.rs
+++ b/voxygen/src/render/pipelines/rope.rs
@@ -71,7 +71,7 @@ impl RopeLayout {
                     // locals
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                        visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
@@ -113,6 +113,7 @@ impl RopePipeline {
         global_layout: &GlobalsLayouts,
         layout: &RopeLayout,
         aa_mode: AaMode,
+        format: wgpu::TextureFormat,
     ) -> Self {
         common_base::span!(_guard, "RopePipeline::new");
         let render_pipeline_layout =
@@ -171,8 +172,7 @@ impl RopePipeline {
                 entry_point: "main",
                 targets: &[
                     Some(wgpu::ColorTargetState {
-                        // TODO: use a constant and/or pass in this format on pipeline construction
-                        format: wgpu::TextureFormat::Rgba16Float,
+                        format,
                         blend: Some(wgpu::BlendState {
                             color: wgpu::BlendComponent {
                                 src_factor: wgpu::BlendFactor::SrcAlpha,
diff --git a/voxygen/src/render/pipelines/terrain.rs b/voxygen/src/render/pipelines/terrain.rs
index e713aada1f..3e00c0f7d3 100644
--- a/voxygen/src/render/pipelines/terrain.rs
+++ b/voxygen/src/render/pipelines/terrain.rs
@@ -345,7 +345,7 @@ impl AtlasData for TerrainAtlasData {
             // col lights
             wgpu::BindGroupLayoutEntry {
                 binding: 0,
-                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Float { filterable: true },
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -355,14 +355,14 @@ impl AtlasData for TerrainAtlasData {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 1,
-                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                 count: None,
             },
             // kind
             wgpu::BindGroupLayoutEntry {
                 binding: 2,
-                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Texture {
                     sample_type: wgpu::TextureSampleType::Uint,
                     view_dimension: wgpu::TextureViewDimension::D2,
@@ -372,7 +372,7 @@ impl AtlasData for TerrainAtlasData {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 3,
-                visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                 ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::NonFiltering),
                 count: None,
             },
diff --git a/voxygen/src/render/pipelines/ui.rs b/voxygen/src/render/pipelines/ui.rs
index edbd86972e..1e7ebf4d66 100644
--- a/voxygen/src/render/pipelines/ui.rs
+++ b/voxygen/src/render/pipelines/ui.rs
@@ -188,7 +188,7 @@ impl UiLayout {
                     // tex_locals
                     wgpu::BindGroupLayoutEntry {
                         binding: 2,
-                        visibility: wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT,
+                        visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
                         ty: wgpu::BindingType::Buffer {
                             ty: wgpu::BufferBindingType::Uniform,
                             has_dynamic_offset: false,
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index 05f0f0c13c..e0b726fdd9 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -225,7 +225,7 @@ impl Renderer {
             dx12_shader_compiler: wgpu::Dx12Compiler::Fxc,
             gles_minor_version: wgpu::Gles3MinorVersion::Automatic,
             // TODO: Look into what we want here.
-            flags: wgpu::InstanceFlags::all(),
+            flags: wgpu::InstanceFlags::from_build_config().with_env(),
         });
 
         let dims = window.inner_size();
diff --git a/voxygen/src/render/renderer/pipeline_creation.rs b/voxygen/src/render/renderer/pipeline_creation.rs
index 680cc272a2..a348ba287b 100644
--- a/voxygen/src/render/renderer/pipeline_creation.rs
+++ b/voxygen/src/render/renderer/pipeline_creation.rs
@@ -700,6 +700,7 @@ fn create_ingame_and_shadow_pipelines(
                     &layouts.global,
                     &layouts.rope,
                     pipeline_modes.aa,
+                    format,
                 )
             },
             "rope pipeline creation",
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index c7a3d02a6b..c79a23d6b6 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -1041,10 +1041,14 @@ impl Window {
     pub fn grab_cursor(&mut self, grab: bool) {
         self.cursor_grabbed = grab;
         self.window.set_cursor_visible(!grab);
-        let res = self.window.set_cursor_grab(match grab {
-            true => winit::window::CursorGrabMode::Confined,
-            false => winit::window::CursorGrabMode::None,
-        });
+        use winit::window::CursorGrabMode;
+        let res = if grab {
+            self.window
+                .set_cursor_grab(CursorGrabMode::Locked)
+                .or_else(|_e| self.window.set_cursor_grab(CursorGrabMode::Confined))
+        } else {
+            self.window.set_cursor_grab(CursorGrabMode::None)
+        };
 
         if let Err(e) = res {
             error!(?e, ?grab, "Failed to toggle cursor grab");

From ba2e7f6b1d50ec4f62a4f30e9574df4dd56dd072 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Thu, 25 Jan 2024 00:33:11 +0100
Subject: [PATCH 09/24] add vk as key for vulkan

---
 voxygen/src/render/renderer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index e0b726fdd9..954c4462bf 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -208,7 +208,7 @@ impl Renderer {
         let backends = std::env::var("WGPU_BACKEND")
             .ok()
             .and_then(|backend| match backend.to_lowercase().as_str() {
-                "vulkan" => Some(wgpu::Backends::VULKAN),
+                "vulkan" | "vk" => Some(wgpu::Backends::VULKAN),
                 "metal" => Some(wgpu::Backends::METAL),
                 "dx12" => Some(wgpu::Backends::DX12),
                 "primary" => Some(wgpu::Backends::PRIMARY),

From 1d48bfff31f54f505be947690f9c652a81386ce0 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sat, 27 Jan 2024 20:49:31 +0100
Subject: [PATCH 10/24] Revert atlas texture name

---
 voxygen/src/scene/terrain.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index c3fb40086a..89d104f14d 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -782,7 +782,7 @@ impl<V: RectRasterableVol> Terrain<V> {
             .map(|fmt| {
                 renderer.create_texture_raw(
                     &wgpu::TextureDescriptor {
-                        label: Some("Atlas texture"),
+                        label: Some("Terrain atlas texture"),
                         size: wgpu::Extent3d {
                             width: max_texture_size,
                             height: max_texture_size,
@@ -796,7 +796,7 @@ impl<V: RectRasterableVol> Terrain<V> {
                         view_formats: &[],
                     },
                     &wgpu::TextureViewDescriptor {
-                        label: Some("Atlas texture view"),
+                        label: Some("Terrain atlas texture view"),
                         format: Some(fmt),
                         dimension: Some(wgpu::TextureViewDimension::D2),
                         aspect: wgpu::TextureAspect::All,
@@ -806,7 +806,7 @@ impl<V: RectRasterableVol> Terrain<V> {
                         array_layer_count: None,
                     },
                     &wgpu::SamplerDescriptor {
-                        label: Some("Atlas sampler"),
+                        label: Some("Terrain atlas sampler"),
                         address_mode_u: wgpu::AddressMode::ClampToEdge,
                         address_mode_v: wgpu::AddressMode::ClampToEdge,
                         address_mode_w: wgpu::AddressMode::ClampToEdge,

From 25c4d65b5da1fb5057b7f74e34639d4293bfddad Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sat, 27 Jan 2024 20:52:44 +0100
Subject: [PATCH 11/24] Remove `ThirdPassDrawerPrepared`, change from Discard
 to Store

---
 voxygen/src/menu/char_selection/mod.rs |  3 +-
 voxygen/src/menu/main/mod.rs           |  3 +-
 voxygen/src/menu/server_info/mod.rs    |  3 +-
 voxygen/src/render/renderer/drawer.rs  | 92 +++++++++++---------------
 voxygen/src/session/mod.rs             |  3 +-
 5 files changed, 43 insertions(+), 61 deletions(-)

diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index 42f4171e83..431f411c64 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -324,8 +324,7 @@ impl PlayState for CharSelectionState {
         // Bloom (does nothing if bloom is disabled)
         drawer.run_bloom_passes();
         // PostProcess and UI
-        let mut third_pass_prepared = drawer.prepare_third_pass();
-        let mut third_pass = third_pass_prepared.drawer();
+        let mut third_pass = drawer.third_pass();
         third_pass.draw_postprocess();
         // Draw the UI to the screen.
         if let Some(mut ui_drawer) = third_pass.draw_ui() {
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 6fc0abd4f3..ae728db74d 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -468,8 +468,7 @@ impl PlayState for MainMenuState {
 
     fn render(&self, drawer: &mut Drawer<'_>, _: &Settings) {
         // Draw the UI to the screen.
-        let mut third_pass_prepared = drawer.prepare_third_pass();
-        let mut third_pass = third_pass_prepared.drawer();
+        let mut third_pass = drawer.third_pass();
         if let Some(mut ui_drawer) = third_pass.draw_ui() {
             self.main_menu_ui.render(&mut ui_drawer);
         };
diff --git a/voxygen/src/menu/server_info/mod.rs b/voxygen/src/menu/server_info/mod.rs
index b37afe2bdd..9ff08f298d 100644
--- a/voxygen/src/menu/server_info/mod.rs
+++ b/voxygen/src/menu/server_info/mod.rs
@@ -233,8 +233,7 @@ impl PlayState for ServerInfoState {
 
     fn render(&self, drawer: &mut Drawer<'_>, _: &Settings) {
         // Draw the UI to the screen.
-        let mut third_pass = drawer.prepare_third_pass();
-        let mut third_pass = third_pass.drawer();
+        let mut third_pass = drawer.third_pass();
         if let Some(mut ui_drawer) = third_pass.draw_ui() {
             self.ui.render(&mut ui_drawer);
         };
diff --git a/voxygen/src/render/renderer/drawer.rs b/voxygen/src/render/renderer/drawer.rs
index 6d6fc9445e..7b36ae580c 100644
--- a/voxygen/src/render/renderer/drawer.rs
+++ b/voxygen/src/render/renderer/drawer.rs
@@ -87,6 +87,7 @@ struct RendererBorrow<'frame> {
 }
 
 pub struct Drawer<'frame> {
+    view: wgpu::TextureView,
     encoder: Option<ManualOwningScope<'frame, wgpu::CommandEncoder>>,
     borrow: RendererBorrow<'frame>,
     surface_texture: Option<wgpu::SurfaceTexture>,
@@ -141,7 +142,16 @@ impl<'frame> Drawer<'frame> {
         let encoder =
             ManualOwningScope::start("frame", &mut renderer.profiler, encoder, borrow.device);
 
+        // Create a view to the surface texture.
+        let view = surface_texture
+            .texture
+            .create_view(&wgpu::TextureViewDescriptor {
+                label: Some("Surface texture view"),
+                ..Default::default()
+            });
+
         Self {
+            view,
             encoder: Some(encoder),
             borrow,
             surface_texture: Some(surface_texture),
@@ -341,7 +351,7 @@ impl<'frame> Drawer<'frame> {
                     view: &self.borrow.views.tgt_depth,
                     depth_ops: Some(wgpu::Operations {
                         load: wgpu::LoadOp::Load,
-                        store: wgpu::StoreOp::Discard,
+                        store: wgpu::StoreOp::Store,
                     }),
                     stencil_ops: None,
                 }),
@@ -502,18 +512,37 @@ impl<'frame> Drawer<'frame> {
     ///
     /// Note, this automatically calls the internal `run_ui_premultiply_passes`
     /// to complete any pending image uploads for the UI.
-    pub fn prepare_third_pass(&mut self) -> ThirdPassDrawerPrepared<'_, 'frame> {
+    pub fn third_pass<'a>(&'a mut self) -> ThirdPassDrawer<'a> {
         self.run_ui_premultiply_passes();
+        let encoder = self.encoder.as_mut().unwrap();
+        let device = self.borrow.device;
+        let mut render_pass =
+            encoder.scoped_render_pass("third_pass", device, &wgpu::RenderPassDescriptor {
+                label: Some("third pass (postprocess + ui)"),
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                    // If a screenshot was requested render to that as an intermediate texture
+                    // instead
+                    view: self
+                        .taking_screenshot
+                        .as_ref()
+                        .map_or(&self.view, |s| s.texture_view()),
+                    resolve_target: None,
+                    ops: wgpu::Operations {
+                        load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
+                        store: wgpu::StoreOp::Store,
+                    },
+                })],
+                depth_stencil_attachment: None,
+                timestamp_writes: None,
+                occlusion_query_set: None,
+            });
 
-        // Create a view to the surface texture.
-        let view = self.surface_texture.as_ref().unwrap().texture.create_view(
-            &wgpu::TextureViewDescriptor {
-                label: Some("Surface texture view"),
-                ..Default::default()
-            },
-        );
+        render_pass.set_bind_group(0, &self.globals.bind_group, &[]);
 
-        ThirdPassDrawerPrepared { view, drawer: self }
+        ThirdPassDrawer {
+            render_pass,
+            borrow: &self.borrow,
+        }
     }
 
     #[cfg(feature = "egui-ui")]
@@ -1312,49 +1341,6 @@ impl<'pass_ref, 'pass: 'pass_ref> TrailDrawer<'pass_ref, 'pass> {
     }
 }
 
-/// Third pass drawer intermediate representation in order to store
-/// the surface texture view (in case it's used).
-pub struct ThirdPassDrawerPrepared<'pass, 'drawer> {
-    /// The texture view to render to.
-    view: wgpu::TextureView,
-    drawer: &'pass mut Drawer<'drawer>,
-}
-
-impl<'pass, 'drawer> ThirdPassDrawerPrepared<'pass, 'drawer> {
-    pub fn drawer(&mut self) -> ThirdPassDrawer {
-        let encoder = self.drawer.encoder.as_mut().unwrap();
-        let device = self.drawer.borrow.device;
-        let mut render_pass =
-            encoder.scoped_render_pass("third_pass", device, &wgpu::RenderPassDescriptor {
-                label: Some("third pass (postprocess + ui)"),
-                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
-                    // If a screenshot was requested render to that as an intermediate texture
-                    // instead
-                    view: self
-                        .drawer
-                        .taking_screenshot
-                        .as_ref()
-                        .map_or(&self.view, |s| s.texture_view()),
-                    resolve_target: None,
-                    ops: wgpu::Operations {
-                        load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                        store: wgpu::StoreOp::Store,
-                    },
-                })],
-                depth_stencil_attachment: None,
-                timestamp_writes: None,
-                occlusion_query_set: None,
-            });
-
-        render_pass.set_bind_group(0, &self.drawer.globals.bind_group, &[]);
-
-        ThirdPassDrawer {
-            render_pass,
-            borrow: &self.drawer.borrow,
-        }
-    }
-}
-
 /// Third pass: postprocess + ui
 #[must_use]
 pub struct ThirdPassDrawer<'pass> {
diff --git a/voxygen/src/session/mod.rs b/voxygen/src/session/mod.rs
index 8bbf6cf3ac..1ec6afb16e 100644
--- a/voxygen/src/session/mod.rs
+++ b/voxygen/src/session/mod.rs
@@ -2146,8 +2146,7 @@ impl PlayState for SessionState {
         // PostProcess and UI
         {
             prof_span!("post-process and ui");
-            let mut third_pass_prepared = drawer.prepare_third_pass();
-            let mut third_pass = third_pass_prepared.drawer();
+            let mut third_pass = drawer.third_pass();
             third_pass.draw_postprocess();
             // Draw the UI to the screen
             if let Some(mut ui_drawer) = third_pass.draw_ui() {

From cfd0ffd7f638163a7d14625e009084665495a876 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sat, 27 Jan 2024 20:58:48 +0100
Subject: [PATCH 12/24] don't create view in `draw_egui`

---
 voxygen/src/render/renderer/drawer.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/voxygen/src/render/renderer/drawer.rs b/voxygen/src/render/renderer/drawer.rs
index 7b36ae580c..f0a59fa5da 100644
--- a/voxygen/src/render/renderer/drawer.rs
+++ b/voxygen/src/render/renderer/drawer.rs
@@ -574,20 +574,13 @@ impl<'frame> Drawer<'frame> {
             &screen_descriptor,
         );
 
-        let view = self.surface_texture.as_ref().unwrap().texture.create_view(
-            &wgpu::TextureViewDescriptor {
-                label: Some("Surface texture view"),
-                ..Default::default()
-            },
-        );
-
         self.borrow
             .egui_render_pass
             .execute(
                 self.encoder.as_mut().unwrap(),
                 self.taking_screenshot
                     .as_ref()
-                    .map_or(&view, |s| s.texture_view()),
+                    .map_or(&self.view, |s| s.texture_view()),
                 &paint_jobs,
                 &screen_descriptor,
                 None,

From 89d70cc932fd0c80d40ae79887dff2fbe6e8d018 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sat, 27 Jan 2024 22:57:29 +0100
Subject: [PATCH 13/24] cache present modes, add check for present modes in
 `set_render_mode` and move present mode localization to hud

---
 voxygen/src/hud/settings_window/video.rs | 11 ++++++--
 voxygen/src/render/mod.rs                | 11 --------
 voxygen/src/render/renderer.rs           | 32 ++++++++++++++++--------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/voxygen/src/hud/settings_window/video.rs b/voxygen/src/hud/settings_window/video.rs
index 577b98051a..8ef6de96af 100644
--- a/voxygen/src/hud/settings_window/video.rs
+++ b/voxygen/src/hud/settings_window/video.rs
@@ -7,7 +7,7 @@ use crate::{
     },
     render::{
         AaMode, BloomConfig, BloomFactor, BloomMode, CloudMode, FluidMode, LightingMode,
-        ReflectionMode, RenderMode, ShadowMapMode, ShadowMode, UpscaleMode,
+        PresentMode, ReflectionMode, RenderMode, ShadowMapMode, ShadowMode, UpscaleMode,
     },
     session::settings_change::Graphics as GraphicsChange,
     settings::{Fps, GraphicsSettings},
@@ -662,7 +662,14 @@ impl<'a> Widget for Video<'a> {
         let mode_list = self.global_state.window.renderer().present_modes();
         let mode_label_list = mode_list
             .iter()
-            .map(|mode| self.localized_strings.get_msg(mode.localize()))
+            .map(|mode| {
+                self.localized_strings.get_msg(match mode {
+                    PresentMode::Fifo => "hud-settings-present_mode-vsync_capped",
+                    PresentMode::FifoRelaxed => "hud-settings-present_mode-vsync_adaptive",
+                    PresentMode::Mailbox => "hud-settings-present_mode-vsync_uncapped",
+                    PresentMode::Immediate => "hud-settings-present_mode-vsync_off",
+                })
+            })
             .collect::<Vec<_>>();
 
         // Get which present mode is currently active
diff --git a/voxygen/src/render/mod.rs b/voxygen/src/render/mod.rs
index 222b7f1dd8..5bbc74ffe1 100644
--- a/voxygen/src/render/mod.rs
+++ b/voxygen/src/render/mod.rs
@@ -298,17 +298,6 @@ pub enum PresentMode {
     Fifo, // has to be last for `#[serde(other)]`
 }
 
-impl PresentMode {
-    pub fn localize(&self) -> &'static str {
-        match self {
-            Self::Fifo => "hud-settings-present_mode-vsync_capped",
-            Self::FifoRelaxed => "hud-settings-present_mode-vsync_adaptive",
-            Self::Mailbox => "hud-settings-present_mode-vsync_uncapped",
-            Self::Immediate => "hud-settings-present_mode-vsync_off",
-        }
-    }
-}
-
 impl From<PresentMode> for wgpu::PresentMode {
     fn from(mode: PresentMode) -> Self {
         match mode {
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index 954c4462bf..13ceeafc12 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -135,7 +135,6 @@ enum State {
 pub struct Renderer {
     device: Arc<wgpu::Device>,
     queue: wgpu::Queue,
-    adapter: wgpu::Adapter,
     surface: wgpu::Surface,
     surface_config: wgpu::SurfaceConfiguration,
 
@@ -185,6 +184,8 @@ pub struct Renderer {
 
     /// The texture format used for the intermediate rendering passes
     intermediate_format: wgpu::TextureFormat,
+
+    present_modes: Vec<PresentMode>,
 }
 
 impl Renderer {
@@ -562,10 +563,16 @@ impl Renderer {
         #[cfg(feature = "egui-ui")]
         let egui_renderpass = egui_wgpu_backend::RenderPass::new(&device, format, 1);
 
+        let present_modes = surface
+            .get_capabilities(&adapter)
+            .present_modes
+            .into_iter()
+            .filter_map(|present_mode| PresentMode::try_from(present_mode).ok())
+            .collect();
+
         Ok(Self {
             device,
             queue,
-            adapter,
             surface,
             surface_config,
 
@@ -606,6 +613,7 @@ impl Renderer {
             graphics_backend,
 
             intermediate_format,
+            present_modes,
         })
     }
 
@@ -642,7 +650,16 @@ impl Renderer {
             self.other_modes = other_modes;
 
             // Update present mode in swap chain descriptor
-            self.surface_config.present_mode = self.other_modes.present_mode.into();
+            self.surface_config.present_mode =
+                if self.present_modes.contains(&self.other_modes.present_mode) {
+                    self.other_modes.present_mode
+                } else {
+                    *self
+                        .present_modes
+                        .first()
+                        .expect("There should never be no supported present modes")
+                }
+                .into();
 
             // Only enable profiling if the wgpu features are enabled
             self.other_modes.profiler_enabled &= self.profiler_features_enabled;
@@ -687,14 +704,7 @@ impl Renderer {
     pub fn pipeline_modes(&self) -> &PipelineModes { &self.pipeline_modes }
 
     /// Get the supported present modes.
-    pub fn present_modes(&self) -> Vec<PresentMode> {
-        self.surface
-            .get_capabilities(&self.adapter)
-            .present_modes
-            .into_iter()
-            .filter_map(|present_mode| PresentMode::try_from(present_mode).ok())
-            .collect()
-    }
+    pub fn present_modes(&self) -> &[PresentMode] { &self.present_modes }
 
     /// Get the current profiling times
     /// Nested timings immediately follow their parent

From 3192ed037f45ea95199b94ada9c9736e816f6b23 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sat, 27 Jan 2024 22:58:40 +0100
Subject: [PATCH 14/24] remove unnecessary lifetime

---
 voxygen/src/render/renderer/drawer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/voxygen/src/render/renderer/drawer.rs b/voxygen/src/render/renderer/drawer.rs
index f0a59fa5da..f16c4d683a 100644
--- a/voxygen/src/render/renderer/drawer.rs
+++ b/voxygen/src/render/renderer/drawer.rs
@@ -512,7 +512,7 @@ impl<'frame> Drawer<'frame> {
     ///
     /// Note, this automatically calls the internal `run_ui_premultiply_passes`
     /// to complete any pending image uploads for the UI.
-    pub fn third_pass<'a>(&'a mut self) -> ThirdPassDrawer<'a> {
+    pub fn third_pass(&mut self) -> ThirdPassDrawer {
         self.run_ui_premultiply_passes();
         let encoder = self.encoder.as_mut().unwrap();
         let device = self.borrow.device;

From 1e40fa55c244826be81c9dc8e4d90922f463f90e Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sat, 27 Jan 2024 23:05:06 +0100
Subject: [PATCH 15/24] expect on profiler creation error

---
 voxygen/src/render/error.rs    | 2 --
 voxygen/src/render/renderer.rs | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/voxygen/src/render/error.rs b/voxygen/src/render/error.rs
index 25c585a022..f8434fb66e 100644
--- a/voxygen/src/render/error.rs
+++ b/voxygen/src/render/error.rs
@@ -8,7 +8,6 @@ pub enum RenderError {
     CouldNotFindAdapter,
     ErrorInitializingCompiler,
     ShaderError(String, shaderc::Error),
-    ProfilerCreationError(wgpu_profiler::CreationError),
 }
 
 use std::fmt;
@@ -31,7 +30,6 @@ impl fmt::Debug for RenderError {
                 f,
                 "\"{shader_name}\" shader failed to compile due to the following error: {err}",
             ),
-            RenderError::ProfilerCreationError(err) => write!(f, "Profiler creation error: {err}"),
         }
     }
 }
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index 13ceeafc12..d471675084 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -558,7 +558,7 @@ impl Renderer {
             enable_debug_groups: other_modes.profiler_enabled,
             max_num_pending_frames: 4,
         })
-        .map_err(RenderError::ProfilerCreationError)?;
+        .expect("Error creating profiler");
 
         #[cfg(feature = "egui-ui")]
         let egui_renderpass = egui_wgpu_backend::RenderPass::new(&device, format, 1);
@@ -674,11 +674,7 @@ impl Renderer {
                     enable_debug_groups: self.other_modes.profiler_enabled,
                     max_num_pending_frames: 4,
                 })
-                .map_err(|err| {
-                    RenderError::ProfilerCreationError(
-                        wgpu_profiler::CreationError::InvalidSettings(err),
-                    )
-                })?;
+                .expect("Error creating profiler");
 
             // Recreate render target
             self.on_resize(self.resolution);

From a9ea5d31bd4bcc04eca13b723d6943d03535e0e6 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sat, 27 Jan 2024 23:18:35 +0100
Subject: [PATCH 16/24] remove resolved todo question

---
 voxygen/src/render/renderer/screenshot.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/voxygen/src/render/renderer/screenshot.rs b/voxygen/src/render/renderer/screenshot.rs
index fe606f3ac7..2cd100c7f6 100644
--- a/voxygen/src/render/renderer/screenshot.rs
+++ b/voxygen/src/render/renderer/screenshot.rs
@@ -123,8 +123,7 @@ impl TakeScreenshot {
         );
 
         move || {
-            // TODO: Do we need a thread for this now that we handle screenshots in a
-            // callback from wgpu? Send buffer to another thread for async
+            // Send buffer to another thread for async
             // mapping, downloading, and passing to the given handler function
             // (which probably saves it to the disk)
             std::thread::Builder::new()

From 6d45d21d95505f0acf90fee7da5183c3f19093eb Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sat, 27 Jan 2024 23:26:05 +0100
Subject: [PATCH 17/24] remove vulkan validation layer from nix

---
 flake.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index fea9a80e9d..095ef0d378 100644
--- a/flake.nix
+++ b/flake.nix
@@ -127,8 +127,6 @@
             export VELOREN_GIT_VERSION="${git.prettyRev}"
             export VELOREN_GIT_TAG="${git.tag}"
           '';
-
-          VK_ADD_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
         });
 
         nci.projects."veloren" = {

From 2f544868ef7ab1d6b8e131d1cc3857afaa8c0a73 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sun, 28 Jan 2024 08:58:57 +0100
Subject: [PATCH 18/24] various fixes

- Renames `Drawer::view` to `Drawer::surface_view`.
- Only set present mode if it's supported in `set_render_mode`.
- Don't create view in `Drawer::drop`.
- Format changes.
---
 voxygen/src/render/renderer.rs        | 16 +++++-----------
 voxygen/src/render/renderer/drawer.rs | 20 +++++++-------------
 voxygen/src/window.rs                 |  3 ++-
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index d471675084..e07d5157c8 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -185,6 +185,7 @@ pub struct Renderer {
     /// The texture format used for the intermediate rendering passes
     intermediate_format: wgpu::TextureFormat,
 
+    /// Supported present modes.
     present_modes: Vec<PresentMode>,
 }
 
@@ -649,17 +650,10 @@ impl Renderer {
         if self.other_modes != other_modes {
             self.other_modes = other_modes;
 
-            // Update present mode in swap chain descriptor
-            self.surface_config.present_mode =
-                if self.present_modes.contains(&self.other_modes.present_mode) {
-                    self.other_modes.present_mode
-                } else {
-                    *self
-                        .present_modes
-                        .first()
-                        .expect("There should never be no supported present modes")
-                }
-                .into();
+            // Update present mode in swap chain descriptor if it is supported.
+            if self.present_modes.contains(&self.other_modes.present_mode) {
+                self.surface_config.present_mode = self.other_modes.present_mode.into()
+            }
 
             // Only enable profiling if the wgpu features are enabled
             self.other_modes.profiler_enabled &= self.profiler_features_enabled;
diff --git a/voxygen/src/render/renderer/drawer.rs b/voxygen/src/render/renderer/drawer.rs
index f16c4d683a..a00c5b8940 100644
--- a/voxygen/src/render/renderer/drawer.rs
+++ b/voxygen/src/render/renderer/drawer.rs
@@ -87,7 +87,7 @@ struct RendererBorrow<'frame> {
 }
 
 pub struct Drawer<'frame> {
-    view: wgpu::TextureView,
+    surface_view: wgpu::TextureView,
     encoder: Option<ManualOwningScope<'frame, wgpu::CommandEncoder>>,
     borrow: RendererBorrow<'frame>,
     surface_texture: Option<wgpu::SurfaceTexture>,
@@ -143,7 +143,7 @@ impl<'frame> Drawer<'frame> {
             ManualOwningScope::start("frame", &mut renderer.profiler, encoder, borrow.device);
 
         // Create a view to the surface texture.
-        let view = surface_texture
+        let surface_view = surface_texture
             .texture
             .create_view(&wgpu::TextureViewDescriptor {
                 label: Some("Surface texture view"),
@@ -151,7 +151,7 @@ impl<'frame> Drawer<'frame> {
             });
 
         Self {
-            view,
+            surface_view,
             encoder: Some(encoder),
             borrow,
             surface_texture: Some(surface_texture),
@@ -514,6 +514,7 @@ impl<'frame> Drawer<'frame> {
     /// to complete any pending image uploads for the UI.
     pub fn third_pass(&mut self) -> ThirdPassDrawer {
         self.run_ui_premultiply_passes();
+
         let encoder = self.encoder.as_mut().unwrap();
         let device = self.borrow.device;
         let mut render_pass =
@@ -525,7 +526,7 @@ impl<'frame> Drawer<'frame> {
                     view: self
                         .taking_screenshot
                         .as_ref()
-                        .map_or(&self.view, |s| s.texture_view()),
+                        .map_or(&self.surface_view, |s| s.texture_view()),
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
@@ -580,7 +581,7 @@ impl<'frame> Drawer<'frame> {
                 self.encoder.as_mut().unwrap(),
                 self.taking_screenshot
                     .as_ref()
-                    .map_or(&self.view, |s| s.texture_view()),
+                    .map_or(&self.surface_view, |s| s.texture_view()),
                 &paint_jobs,
                 &screen_descriptor,
                 None,
@@ -754,13 +755,6 @@ impl<'frame> Drop for Drawer<'frame> {
             .take()
             .zip(self.borrow.pipelines.blit())
             .map(|(screenshot, blit)| {
-                let view = self.surface_texture.as_ref().unwrap().texture.create_view(
-                    &wgpu::TextureViewDescriptor {
-                        label: Some("Surface texture view"),
-                        ..Default::default()
-                    },
-                );
-
                 // Image needs to be copied from the screenshot texture to the swapchain texture
                 let mut render_pass = encoder.scoped_render_pass(
                     "screenshot blit",
@@ -768,7 +762,7 @@ impl<'frame> Drop for Drawer<'frame> {
                     &wgpu::RenderPassDescriptor {
                         label: Some("Blit screenshot pass"),
                         color_attachments: &[Some(wgpu::RenderPassColorAttachment {
-                            view: &view,
+                            view: &self.surface_view,
                             resolve_target: None,
                             ops: wgpu::Operations {
                                 load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index c79a23d6b6..e73a74a394 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -1039,9 +1039,10 @@ impl Window {
     pub fn is_cursor_grabbed(&self) -> bool { self.cursor_grabbed }
 
     pub fn grab_cursor(&mut self, grab: bool) {
+        use winit::window::CursorGrabMode;
+
         self.cursor_grabbed = grab;
         self.window.set_cursor_visible(!grab);
-        use winit::window::CursorGrabMode;
         let res = if grab {
             self.window
                 .set_cursor_grab(CursorGrabMode::Locked)

From 64eda770fbedd56c88f00419221c76a828205b2c Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sun, 28 Jan 2024 16:08:07 +0100
Subject: [PATCH 19/24] cache max texture size

---
 voxygen/src/render/renderer.rs                | 36 ++++++++++++-------
 .../src/render/renderer/rain_occlusion_map.rs |  7 ++--
 voxygen/src/render/renderer/shadow_map.rs     |  7 ++--
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index e07d5157c8..98ba157c64 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -187,6 +187,8 @@ pub struct Renderer {
 
     /// Supported present modes.
     present_modes: Vec<PresentMode>,
+    /// Cached max texture size.
+    max_texture_size: u32,
 }
 
 impl Renderer {
@@ -349,6 +351,8 @@ impl Renderer {
             );
         }
 
+        let max_texture_size = device.limits().max_texture_dimension_2d;
+
         let surface_capabilities = surface.get_capabilities(&adapter);
         let format = surface_capabilities.formats[0];
         info!("Using {:?} as the surface format", format);
@@ -409,18 +413,22 @@ impl Renderer {
             &device,
             (dims.width, dims.height),
             &ShadowMapMode::try_from(pipeline_modes.shadow).unwrap_or_default(),
+            max_texture_size,
         )
         .map_err(|err| {
             warn!("Could not create shadow map views: {:?}", err);
         })
         .ok();
 
-        let rain_occlusion_view =
-            RainOcclusionMap::create_view(&device, &pipeline_modes.rain_occlusion)
-                .map_err(|err| {
-                    warn!("Could not create rain occlusion map views: {:?}", err);
-                })
-                .ok();
+        let rain_occlusion_view = RainOcclusionMap::create_view(
+            &device,
+            &pipeline_modes.rain_occlusion,
+            max_texture_size,
+        )
+        .map_err(|err| {
+            warn!("Could not create rain occlusion map views: {:?}", err);
+        })
+        .ok();
 
         let shaders = Shaders::load_expect("");
         let shaders_watcher = shaders.reload_watcher();
@@ -614,7 +622,9 @@ impl Renderer {
             graphics_backend,
 
             intermediate_format,
+
             present_modes,
+            max_texture_size,
         })
     }
 
@@ -808,7 +818,12 @@ impl Renderer {
             if let (Some((point_depth, directed_depth)), ShadowMode::Map(mode)) =
                 (shadow_views, self.pipeline_modes.shadow)
             {
-                match ShadowMap::create_shadow_views(&self.device, (dims.x, dims.y), &mode) {
+                match ShadowMap::create_shadow_views(
+                    &self.device,
+                    (dims.x, dims.y),
+                    &mode,
+                    self.max_texture_size,
+                ) {
                     Ok((new_point_depth, new_directed_depth)) => {
                         *point_depth = new_point_depth;
                         *directed_depth = new_directed_depth;
@@ -824,6 +839,7 @@ impl Renderer {
                 match RainOcclusionMap::create_view(
                     &self.device,
                     &self.pipeline_modes.rain_occlusion,
+                    self.max_texture_size,
                 ) {
                     Ok(new_rain_depth) => {
                         *rain_depth = new_rain_depth;
@@ -1420,11 +1436,7 @@ impl Renderer {
     }
 
     /// Return the maximum supported texture size.
-    pub fn max_texture_size(&self) -> u32 { Self::max_texture_size_raw(&self.device) }
-
-    fn max_texture_size_raw(device: &wgpu::Device) -> u32 {
-        device.limits().max_texture_dimension_2d
-    }
+    pub fn max_texture_size(&self) -> u32 { self.max_texture_size }
 
     /// Create a new immutable texture from the provided image.
     /// # Panics
diff --git a/voxygen/src/render/renderer/rain_occlusion_map.rs b/voxygen/src/render/renderer/rain_occlusion_map.rs
index 720c821377..bdc44f9861 100644
--- a/voxygen/src/render/renderer/rain_occlusion_map.rs
+++ b/voxygen/src/render/renderer/rain_occlusion_map.rs
@@ -1,9 +1,6 @@
 use crate::{render::pipelines::rain_occlusion, scene::terrain::RAIN_OCCLUSION_CHUNKS};
 
-use super::{
-    super::{texture::Texture, RenderError, ShadowMapMode},
-    Renderer,
-};
+use super::super::{texture::Texture, RenderError, ShadowMapMode};
 use common::{terrain::TerrainChunkSize, vol::RectVolSize};
 use vek::*;
 
@@ -121,11 +118,11 @@ impl RainOcclusionMap {
     pub(super) fn create_view(
         device: &wgpu::Device,
         mode: &ShadowMapMode,
+        max_texture_size: u32,
     ) -> Result<Texture, RenderError> {
         // (Attempt to) apply resolution factor to rain occlusion map resolution.
         let resolution_factor = mode.resolution.clamped(0.25, 4.0);
 
-        let max_texture_size = Renderer::max_texture_size_raw(device);
         let size =
             (RAIN_OCCLUSION_CHUNKS as f32).sqrt().ceil() as u32 * TerrainChunkSize::RECT_SIZE * 2;
 
diff --git a/voxygen/src/render/renderer/shadow_map.rs b/voxygen/src/render/renderer/shadow_map.rs
index ef9b363932..7b5ab16e0f 100644
--- a/voxygen/src/render/renderer/shadow_map.rs
+++ b/voxygen/src/render/renderer/shadow_map.rs
@@ -1,7 +1,4 @@
-use super::{
-    super::{pipelines::shadow, texture::Texture, RenderError, ShadowMapMode},
-    Renderer,
-};
+use super::super::{pipelines::shadow, texture::Texture, RenderError, ShadowMapMode};
 use vek::*;
 
 /// A type that holds shadow map data.  Since shadow mapping may not be
@@ -150,11 +147,11 @@ impl ShadowMap {
         device: &wgpu::Device,
         size: (u32, u32),
         mode: &ShadowMapMode,
+        max_texture_size: u32,
     ) -> Result<(Texture, Texture), RenderError> {
         // (Attempt to) apply resolution factor to shadow map resolution.
         let resolution_factor = mode.resolution.clamped(0.25, 4.0);
 
-        let max_texture_size = Renderer::max_texture_size_raw(device);
         // Limit to max texture size, rather than erroring.
         let size = Vec2::new(size.0, size.1).map(|e| {
             let size = e as f32 * resolution_factor;

From a094495160c7d11684677df18a5c79a100859bf5 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Sun, 28 Jan 2024 16:10:56 +0100
Subject: [PATCH 20/24] add to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d20e78c7fa..c479b234ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Renamed "Burning Potion" to "Potion of Combustion"
 - Render LoD terrain on the character selection screen
 - Camera no longer jumps on first mouse event after cursor grab is released on macos
+- Updated wgpu. Now supports OpenGL. Dx11 no longer supported.
 
 ### Removed
 - Medium and large potions from all loot tables

From 95c7e6bd82adf33594b7f74fdbb3f74a8975e602 Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Tue, 30 Jan 2024 00:56:34 +0100
Subject: [PATCH 21/24] list opengl for list-wgpu-backends

---
 voxygen/src/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs
index f09999c422..242aee437d 100644
--- a/voxygen/src/main.rs
+++ b/voxygen/src/main.rs
@@ -50,9 +50,9 @@ fn main() {
         match command {
             cli::Commands::ListWgpuBackends => {
                 #[cfg(target_os = "windows")]
-                let backends = &["dx11", "dx12", "vulkan"];
+                let backends = &["opengl", "dx12", "vulkan"];
                 #[cfg(target_os = "linux")]
-                let backends = &["vulkan"];
+                let backends = &["opengl", "vulkan"];
                 #[cfg(target_os = "macos")]
                 let backends = &["metal"];
 

From db9eca031cc1b0d316a2f799cef91fe32f2c417c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Wed, 31 Jan 2024 18:33:03 +0100
Subject: [PATCH 22/24] use constants in dummy_scene

---
 voxygen/src/menu/dummy_scene.rs | 8 +++++---
 voxygen/src/scene/mod.rs        | 9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/voxygen/src/menu/dummy_scene.rs b/voxygen/src/menu/dummy_scene.rs
index e3742de385..48cd27e17e 100644
--- a/voxygen/src/menu/dummy_scene.rs
+++ b/voxygen/src/menu/dummy_scene.rs
@@ -11,12 +11,14 @@ impl Scene {
     pub fn new(renderer: &mut Renderer) -> Self {
         let global_data = GlobalModel {
             globals: renderer.create_consts(&[Globals::default()]),
-            lights: renderer.create_consts(&[Light::default(); 20]),
-            shadows: renderer.create_consts(&[Shadow::default(); 32]),
+            lights: renderer.create_consts(&[Light::default(); crate::scene::MAX_LIGHT_COUNT]),
+            shadows: renderer.create_consts(&[Shadow::default(); crate::scene::MAX_SHADOW_COUNT]),
             shadow_mats: renderer.create_shadow_bound_locals(&[ShadowLocals::default()]),
             rain_occlusion_mats: renderer
                 .create_rain_occlusion_bound_locals(&[RainOcclusionLocals::default()]),
-            point_light_matrices: Box::new([PointLightMatrix::default(); 126]),
+            point_light_matrices: Box::new(
+                [PointLightMatrix::default(); crate::scene::MAX_POINT_LIGHT_MATRICES_COUNT],
+            ),
         };
 
         let lod_data = LodData::dummy(renderer);
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index a813459769..0b9aa85653 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -53,8 +53,9 @@ const ZOOM_CAP_ADMIN: f32 = 100000.0;
 // TODO: Don't hard-code this.
 const CURSOR_PAN_SCALE: f32 = 0.005;
 
-const MAX_LIGHT_COUNT: usize = 20; // 31 (total shadow_mats is limited to 128 with default max_uniform_buffer_binding_size)
-const MAX_SHADOW_COUNT: usize = 24;
+pub(crate) const MAX_LIGHT_COUNT: usize = 20; // 31 (total shadow_mats is limited to 128 with default max_uniform_buffer_binding_size)
+pub(crate) const MAX_SHADOW_COUNT: usize = 24;
+pub(crate) const MAX_POINT_LIGHT_MATRICES_COUNT: usize = MAX_LIGHT_COUNT * 6 + 6;
 const NUM_DIRECTED_LIGHTS: usize = 1;
 const LIGHT_DIST_RADIUS: f32 = 64.0; // The distance beyond which lights may not emit light from their origin
 const SHADOW_DIST_RADIUS: f32 = 8.0;
@@ -304,7 +305,9 @@ impl Scene {
             shadow_mats: renderer.create_shadow_bound_locals(&[ShadowLocals::default()]),
             rain_occlusion_mats: renderer
                 .create_rain_occlusion_bound_locals(&[RainOcclusionLocals::default()]),
-            point_light_matrices: Box::new([PointLightMatrix::default(); MAX_LIGHT_COUNT * 6 + 6]),
+            point_light_matrices: Box::new(
+                [PointLightMatrix::default(); MAX_POINT_LIGHT_MATRICES_COUNT],
+            ),
         };
 
         let lod = Lod::new(renderer, client, settings);

From dfb8715aed7e4117f9f149ef85871edfeb6de52b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Wed, 31 Jan 2024 18:52:46 +0100
Subject: [PATCH 23/24] make map_async function slim and handle the other stuff
 inside the download_and_handle_internal fn which is only called from a
 seperate thread

---
 voxygen/src/render/renderer/screenshot.rs | 163 ++++++++++++----------
 1 file changed, 89 insertions(+), 74 deletions(-)

diff --git a/voxygen/src/render/renderer/screenshot.rs b/voxygen/src/render/renderer/screenshot.rs
index 2cd100c7f6..d7306c9a48 100644
--- a/voxygen/src/render/renderer/screenshot.rs
+++ b/voxygen/src/render/renderer/screenshot.rs
@@ -1,5 +1,6 @@
 use super::super::pipelines::blit;
 use common_base::prof_span;
+use crossbeam_channel;
 use tracing::error;
 
 pub type ScreenshotFn = Box<dyn FnOnce(Result<image::RgbImage, String>) + Send>;
@@ -135,6 +136,7 @@ impl TakeScreenshot {
         }
     }
 
+    /// Don't call this from the main loop, it will block for a while
     fn download_and_handle_internal(self) {
         prof_span!("download_and_handle_internal");
         // Calculate padded bytes per row
@@ -144,82 +146,95 @@ impl TakeScreenshot {
         let buffer = std::sync::Arc::new(self.buffer);
         let buffer2 = std::sync::Arc::clone(&buffer);
         let buffer_slice = buffer.slice(..);
+        let (map_result_sender, map_result_receiver) = crossbeam_channel::bounded(1);
         buffer_slice.map_async(wgpu::MapMode::Read, move |result| {
-            let padded_buffer;
-            let buffer_slice = buffer2.slice(..);
-            let rows = match result {
-                Ok(()) => {
-                    // Copy to a Vec
-                    padded_buffer = buffer_slice.get_mapped_range();
-                    padded_buffer
-                        .chunks(padded_bytes_per_row as usize)
-                        .map(|padded_chunk| {
-                            &padded_chunk[..self.width as usize * self.bytes_per_pixel as usize]
-                        })
-                },
-                // Error
-                Err(err) => {
-                    error!(
-                        ?err,
-                        "Failed to map buffer for downloading a screenshot from the GPU"
-                    );
-                    return;
-                },
-            };
-
-            // Note: we don't use bytes_per_pixel here since we expect only certain formats
-            // below.
-            let bytes_per_rgb = 3;
-            let mut pixel_bytes =
-                Vec::with_capacity(self.width as usize * self.height as usize * bytes_per_rgb);
-            // Construct image
-            let image = match self.tex_format {
-                wgpu::TextureFormat::Bgra8UnormSrgb => {
-                    prof_span!("copy image");
-                    rows.for_each(|row| {
-                        let (pixels, rest) = row.as_chunks();
-                        assert!(
-                            rest.is_empty(),
-                            "Always valid because each pixel uses four bytes"
-                        );
-                        // Swap blue and red components and drop alpha to get a RGB texture.
-                        for &[b, g, r, _a] in pixels {
-                            pixel_bytes.extend_from_slice(&[r, g, b])
-                        }
-                    });
-
-                    Ok(pixel_bytes)
-                },
-                wgpu::TextureFormat::Rgba8UnormSrgb => {
-                    prof_span!("copy image");
-                    rows.for_each(|row| {
-                        let (pixels, rest) = row.as_chunks();
-                        assert!(
-                            rest.is_empty(),
-                            "Always valid because each pixel uses four bytes"
-                        );
-                        // Drop alpha to get a RGB texture.
-                        for &[r, g, b, _a] in pixels {
-                            pixel_bytes.extend_from_slice(&[r, g, b])
-                        }
-                    });
-
-                    Ok(pixel_bytes)
-                },
-                format => Err(format!(
-                    "Unhandled format for screenshot texture: {:?}",
-                    format,
-                )),
-            }
-            .map(|pixel_bytes| {
-                image::RgbImage::from_vec(self.width, self.height, pixel_bytes).expect(
-                    "Failed to create ImageBuffer! Buffer was not large enough. This should not \
-                     occur",
-                )
-            });
-            // Call supplied handler
-            (self.screenshot_fn)(image);
+            map_result_sender
+                .send(result)
+                .expect("seems like the receiver broke, which should not happen");
         });
+        let result = match map_result_receiver.recv() {
+            Ok(result) => result,
+            Err(e) => {
+                error!(
+                    ?e,
+                    "map_async never send the result for the screenshot mapping"
+                );
+                return;
+            },
+        };
+        let padded_buffer;
+        let buffer_slice = buffer2.slice(..);
+        let rows = match result {
+            Ok(()) => {
+                // Copy to a Vec
+                padded_buffer = buffer_slice.get_mapped_range();
+                padded_buffer
+                    .chunks(padded_bytes_per_row as usize)
+                    .map(|padded_chunk| {
+                        &padded_chunk[..self.width as usize * self.bytes_per_pixel as usize]
+                    })
+            },
+            // Error
+            Err(err) => {
+                error!(
+                    ?err,
+                    "Failed to map buffer for downloading a screenshot from the GPU"
+                );
+                return;
+            },
+        };
+
+        // Note: we don't use bytes_per_pixel here since we expect only certain formats
+        // below.
+        let bytes_per_rgb = 3;
+        let mut pixel_bytes =
+            Vec::with_capacity(self.width as usize * self.height as usize * bytes_per_rgb);
+        // Construct image
+        let image = match self.tex_format {
+            wgpu::TextureFormat::Bgra8UnormSrgb => {
+                prof_span!("copy image");
+                rows.for_each(|row| {
+                    let (pixels, rest) = row.as_chunks();
+                    assert!(
+                        rest.is_empty(),
+                        "Always valid because each pixel uses four bytes"
+                    );
+                    // Swap blue and red components and drop alpha to get a RGB texture.
+                    for &[b, g, r, _a] in pixels {
+                        pixel_bytes.extend_from_slice(&[r, g, b])
+                    }
+                });
+
+                Ok(pixel_bytes)
+            },
+            wgpu::TextureFormat::Rgba8UnormSrgb => {
+                prof_span!("copy image");
+                rows.for_each(|row| {
+                    let (pixels, rest) = row.as_chunks();
+                    assert!(
+                        rest.is_empty(),
+                        "Always valid because each pixel uses four bytes"
+                    );
+                    // Drop alpha to get a RGB texture.
+                    for &[r, g, b, _a] in pixels {
+                        pixel_bytes.extend_from_slice(&[r, g, b])
+                    }
+                });
+
+                Ok(pixel_bytes)
+            },
+            format => Err(format!(
+                "Unhandled format for screenshot texture: {:?}",
+                format,
+            )),
+        }
+        .map(|pixel_bytes| {
+            image::RgbImage::from_vec(self.width, self.height, pixel_bytes).expect(
+                "Failed to create ImageBuffer! Buffer was not large enough. This should not occur",
+            )
+        });
+        // Call supplied handler
+        (self.screenshot_fn)(image);
     }
 }
 

From 94df06ca19d9a736b5e5a266e9398392edb67027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Wed, 31 Jan 2024 22:42:06 +0100
Subject: [PATCH 24/24] remove outdated comment and make use of more constants

---
 voxygen/Cargo.toml          | 1 -
 voxygen/src/scene/simple.rs | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index aa82390c51..36885d0d20 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -57,7 +57,6 @@ voxygen-egui = {package = "veloren-voxygen-egui", path = "egui", optional = true
 
 # Graphics
 winit = {version = "0.28.6", features = ["serde"]}
-# naga has an issue for spirv in wgpu 18.0
 wgpu = { version = "0.18.0", default-features = false, features = ["trace", "spirv", "glsl"] }
 wgpu-profiler = "0.15.0"
 bytemuck = { version="1.7", features=["derive"] }
diff --git a/voxygen/src/scene/simple.rs b/voxygen/src/scene/simple.rs
index be3515ab76..c99c0cb1d9 100644
--- a/voxygen/src/scene/simple.rs
+++ b/voxygen/src/scene/simple.rs
@@ -105,12 +105,14 @@ impl Scene {
 
         let data = GlobalModel {
             globals: renderer.create_consts(&[Globals::default()]),
-            lights: renderer.create_consts(&[Light::default(); 20]),
-            shadows: renderer.create_consts(&[Shadow::default(); 24]),
+            lights: renderer.create_consts(&[Light::default(); crate::scene::MAX_LIGHT_COUNT]),
+            shadows: renderer.create_consts(&[Shadow::default(); crate::scene::MAX_SHADOW_COUNT]),
             shadow_mats: renderer.create_shadow_bound_locals(&[ShadowLocals::default()]),
             rain_occlusion_mats: renderer
                 .create_rain_occlusion_bound_locals(&[RainOcclusionLocals::default()]),
-            point_light_matrices: Box::new([PointLightMatrix::default(); 126]),
+            point_light_matrices: Box::new(
+                [PointLightMatrix::default(); crate::scene::MAX_POINT_LIGHT_MATRICES_COUNT],
+            ),
         };
         let lod = Lod::new(renderer, client, settings);