From cd74c74f6fec70ff4c8589b41a10ab2b68daf218 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Thu, 6 Oct 2022 15:50:46 +0200 Subject: [PATCH] Update to wgpu 0.14 (#2114) --- Cargo.lock | 54 +++++++++-------------- crates/eframe/Cargo.toml | 4 +- crates/eframe/src/web/web_painter_wgpu.rs | 1 + crates/egui-wgpu/Cargo.toml | 2 +- crates/egui-wgpu/src/winit.rs | 1 + 5 files changed, 26 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5ff210e..3c6a95c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -705,12 +705,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "copyless" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" - [[package]] name = "core-foundation" version = "0.9.3" @@ -2016,12 +2010,6 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "inplace_it" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67f0347836f3f6362c1e7efdadde2b1c4b4556d211310b70631bae7eb692070b" - [[package]] name = "instant" version = "0.1.12" @@ -2086,9 +2074,9 @@ checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ "wasm-bindgen", ] @@ -2275,9 +2263,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f50357e1167a3ab92d6b3c7f4bf5f7fd13fde3f4b28bf0d5ea07b5100fdb6c0" +checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707" dependencies = [ "bit-set", "bitflags", @@ -4005,9 +3993,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ "cfg-if", "js-sys", @@ -4129,9 +4117,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.58" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ "js-sys", "wasm-bindgen", @@ -4189,17 +4177,18 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277e967bf8b7820a76852645a6bce8bbd31c32fda2042e82d8e3ea75fda8892d" +checksum = "c2272b17bffc8a0c7d53897435da7c1db587c87d3a14e8dae9cdb8d1d210fc0f" dependencies = [ "arrayvec 0.7.2", "js-sys", "log", "naga", "parking_lot", - "raw-window-handle 0.4.3", + "raw-window-handle 0.5.0", "smallvec", + "static_assertions", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4210,22 +4199,21 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b92788dec9d0c1bed849a1b83f01b2ee12819bf04a79c90f68e4173f7b5ba2" +checksum = "73d14cad393054caf992ee02b7da6a372245d39a484f7461c1f44f6f6359bd28" dependencies = [ "arrayvec 0.7.2", "bit-vec", "bitflags", "cfg_aliases", "codespan-reporting", - "copyless", "fxhash", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.4.3", + "raw-window-handle 0.5.0", "smallvec", "thiserror", "web-sys", @@ -4235,9 +4223,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cbdfc3d0637dba3d5536b93adef3d26023a0b96f0e1ee5ee9560a401d9f646" +checksum = "cdae6a80dbc725343f02f854b310b37190be946aeea65e9d83afaa7d840ebaac" dependencies = [ "android_system_properties", "arrayvec 0.7.2", @@ -4252,7 +4240,6 @@ dependencies = [ "glow", "gpu-alloc", "gpu-descriptor", - "inplace_it", "js-sys", "khronos-egl", "libloading", @@ -4263,8 +4250,9 @@ dependencies = [ "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.4.3", + "raw-window-handle 0.5.0", "renderdoc-sys", + "smallvec", "thiserror", "wasm-bindgen", "web-sys", @@ -4274,9 +4262,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f762cbc08e1a51389859cf9c199c7aef544789cf3510889aab12c607f701604" +checksum = "28fb86c1909233c804aa79b7dd1ad06ebd979b2a465e3e980582db0ea9e69f3f" dependencies = [ "bitflags", ] diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index a190c4f0..b968c23a 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -88,7 +88,7 @@ dark-light = { version = "0.2.1", optional = true } directories-next = { version = "2", optional = true } egui-wgpu = { version = "0.19.0", path = "../egui-wgpu", optional = true, features = ["winit"] } # if wgpu is used, use it with winit puffin = { version = "0.13", optional = true } -wgpu = { version = "0.13", optional = true } +wgpu = { version = "0.14", optional = true } # ------------------------------------------- # web: @@ -145,4 +145,4 @@ web-sys = { version = "0.3.58", features = [ # optional web: egui-wgpu = { version = "0.19.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit tts = { version = "0.20", optional = true } # Can't use 0.21-0.24 due to compilation problems on linux -wgpu = { version = "0.13", optional = true, features = ["webgl"] } +wgpu = { version = "0.14", optional = true, features = ["webgl"] } diff --git a/crates/eframe/src/web/web_painter_wgpu.rs b/crates/eframe/src/web/web_painter_wgpu.rs index 66bb0e36..1566d2ee 100644 --- a/crates/eframe/src/web/web_painter_wgpu.rs +++ b/crates/eframe/src/web/web_painter_wgpu.rs @@ -115,6 +115,7 @@ impl WebPainter for WebPainterWgpu { width: canvas_size[0], height: canvas_size[1], present_mode: wgpu::PresentMode::Fifo, + alpha_mode: wgpu::CompositeAlphaMode::Auto, }, ); self.surface_size = canvas_size.clone(); diff --git a/crates/egui-wgpu/Cargo.toml b/crates/egui-wgpu/Cargo.toml index fe6ecf56..7454bc39 100644 --- a/crates/egui-wgpu/Cargo.toml +++ b/crates/egui-wgpu/Cargo.toml @@ -40,7 +40,7 @@ egui = { version = "0.19.0", path = "../egui", default-features = false, feature bytemuck = "1.7" tracing = { version = "0.1", default-features = false, features = ["std"] } type-map = "0.5.0" -wgpu = "0.13" +wgpu = "0.14" #! ### Optional dependencies ## Enable this when generating docs. diff --git a/crates/egui-wgpu/src/winit.rs b/crates/egui-wgpu/src/winit.rs index f822de4a..f3170866 100644 --- a/crates/egui-wgpu/src/winit.rs +++ b/crates/egui-wgpu/src/winit.rs @@ -129,6 +129,7 @@ impl<'a> Painter<'a> { width: width_in_pixels, height: height_in_pixels, present_mode: self.present_mode, + alpha_mode: wgpu::CompositeAlphaMode::Auto, }; let surface_state = self