diff --git a/Cargo.lock b/Cargo.lock index 9e6516732ec..495e3caafa0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1078,11 +1078,12 @@ dependencies = [ [[package]] name = "d3d12" -version = "0.7.0" -source = "git+https://github.com/gfx-rs/wgpu#7774f310218bd688e27e7688f3ddf8cd39226c96" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ "bitflags 2.4.0", - "libloading 0.7.4", + "libloading 0.8.0", "winapi", ] @@ -1196,7 +1197,7 @@ dependencies = [ "egui-wgpu", "egui-winit", "egui_glow", - "glow 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glow", "glutin", "glutin-winit", "image", @@ -1336,7 +1337,7 @@ dependencies = [ "document-features", "egui", "egui-winit", - "glow 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glow", "glutin", "glutin-winit", "log", @@ -1792,20 +1793,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glow" -version = "0.13.0" -source = "git+https://github.com/grovesNL/glow.git?rev=29ff917a2b2ff7ce0a81b2cc5681de6d4735b36e#29ff917a2b2ff7ce0a81b2cc5681de6d4735b36e" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -2224,9 +2214,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -2442,8 +2432,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.14.2" -source = "git+https://github.com/gfx-rs/wgpu#7774f310218bd688e27e7688f3ddf8cd39226c96" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" dependencies = [ "bit-set", "bitflags 2.4.0", @@ -4007,9 +3998,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4017,9 +4008,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", @@ -4032,9 +4023,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if", "js-sys", @@ -4044,9 +4035,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4054,9 +4045,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", @@ -4067,9 +4058,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wayland-backend" @@ -4182,9 +4173,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -4226,8 +4217,9 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "wgpu" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu#7774f310218bd688e27e7688f3ddf8cd39226c96" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0b71d2ded29e2161db50ab731d6cb42c037bd7ab94864a98fa66ff36b4721a8" dependencies = [ "arrayvec", "cfg-if", @@ -4250,8 +4242,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu#7774f310218bd688e27e7688f3ddf8cd39226c96" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" dependencies = [ "arrayvec", "bit-vec", @@ -4275,8 +4268,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu#7774f310218bd688e27e7688f3ddf8cd39226c96" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11f259ceb56727fb097da108d92f8a5cbdb5b74a77f9e396bd43626f67299d61" dependencies = [ "android_system_properties", "arrayvec", @@ -4287,7 +4281,7 @@ dependencies = [ "cfg_aliases", "core-graphics-types", "d3d12", - "glow 0.13.0 (git+https://github.com/grovesNL/glow.git?rev=29ff917a2b2ff7ce0a81b2cc5681de6d4735b36e)", + "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", @@ -4296,7 +4290,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.7.4", + "libloading 0.8.0", "log", "metal", "naga", @@ -4318,8 +4312,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu#7774f310218bd688e27e7688f3ddf8cd39226c96" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" dependencies = [ "bitflags 2.4.0", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 696c0eb214a..cf8a9ccd866 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,9 +53,7 @@ glow = "0.13" puffin = "0.18" raw-window-handle = "0.5.0" thiserror = "1.0.37" - -# TODO: Use a stable version of wgpu. -wgpu = { git = "https://github.com/gfx-rs/wgpu", commit = "7774f31", features = [ +wgpu = { version = "0.19", features = [ # Make the renderer `Sync` even on wasm32, because it makes the code simpler: "fragile-send-sync-non-atomic-wasm", ] } diff --git a/crates/egui-wgpu/src/winit.rs b/crates/egui-wgpu/src/winit.rs index 19940ff6f3b..76e34387046 100644 --- a/crates/egui-wgpu/src/winit.rs +++ b/crates/egui-wgpu/src/winit.rs @@ -161,6 +161,7 @@ impl Painter { present_mode, alpha_mode: surface_state.alpha_mode, view_formats: vec![render_state.target_format], + desired_maximum_frame_latency: 2, // TODO(emilk): expose to users }, ); } diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml index e85db04525c..9ed73952f47 100644 --- a/crates/egui_demo_app/Cargo.toml +++ b/crates/egui_demo_app/Cargo.toml @@ -83,6 +83,6 @@ rfd = { version = "0.11", optional = true } # web: [target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen = "=0.2.89" +wasm-bindgen = "=0.2.90" wasm-bindgen-futures = "0.4" web-sys = "0.3" diff --git a/scripts/setup_web.sh b/scripts/setup_web.sh index e5dbb08fdbe..36d39128b6e 100755 --- a/scripts/setup_web.sh +++ b/scripts/setup_web.sh @@ -7,4 +7,4 @@ cd "$script_path/.." rustup target add wasm32-unknown-unknown # For generating JS bindings: -cargo install --quiet wasm-bindgen-cli --version 0.2.89 +cargo install --quiet wasm-bindgen-cli --version 0.2.90