diff --git a/Cargo.lock b/Cargo.lock
index 77b1c3463f2b..51c8a972e50b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -348,7 +348,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -384,7 +384,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -611,7 +611,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -851,10 +851,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
-name = "com-rs"
-version = "0.2.1"
+name = "com"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
+dependencies = [
+ "com_macros",
+]
+
+[[package]]
+name = "com_macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
+dependencies = [
+ "com_macros_support",
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "com_macros_support"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
[[package]]
name = "combine"
@@ -1053,9 +1078,9 @@ dependencies = [
[[package]]
name = "d3d12"
-version = "0.7.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
+checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
dependencies = [
"bitflags 2.4.0",
"libloading 0.8.0",
@@ -1184,6 +1209,7 @@ dependencies = [
"pollster",
"puffin",
"raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
"ron",
"serde",
"static_assertions",
@@ -1238,7 +1264,7 @@ dependencies = [
"egui",
"log",
"puffin",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
"serde",
"smithay-clipboard",
"web-time",
@@ -1268,6 +1294,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
+ "wgpu",
]
[[package]]
@@ -1320,6 +1347,7 @@ dependencies = [
"raw-window-handle 0.5.2",
"wasm-bindgen",
"web-sys",
+ "winit",
]
[[package]]
@@ -1379,7 +1407,7 @@ checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -1400,7 +1428,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -1411,7 +1439,7 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -1557,18 +1585,6 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
-[[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"
@@ -1593,7 +1609,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -1733,10 +1749,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
"wasi",
- "wasm-bindgen",
]
[[package]]
@@ -1781,9 +1795,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"
+checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
dependencies = [
"js-sys",
"slotmap",
@@ -1888,11 +1902,10 @@ dependencies = [
[[package]]
name = "gpu-allocator"
-version = "0.23.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad"
+checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
dependencies = [
- "backtrace",
"log",
"presser",
"thiserror",
@@ -1956,14 +1969,14 @@ dependencies = [
[[package]]
name = "hassle-rs"
-version = "0.10.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
dependencies = [
- "bitflags 1.3.2",
- "com-rs",
+ "bitflags 2.4.0",
+ "com",
"libc",
- "libloading 0.7.4",
+ "libloading 0.8.0",
"thiserror",
"widestring",
"winapi",
@@ -2203,9 +2216,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
[[package]]
name = "js-sys"
-version = "0.3.64"
+version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
dependencies = [
"wasm-bindgen",
]
@@ -2421,9 +2434,9 @@ dependencies = [
[[package]]
name = "naga"
-version = "0.14.2"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e"
+checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899"
dependencies = [
"bit-set",
"bitflags 2.4.0",
@@ -2439,15 +2452,6 @@ dependencies = [
"unicode-xid",
]
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom",
-]
-
[[package]]
name = "ndk"
version = "0.8.0"
@@ -2555,7 +2559,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -2656,9 +2660,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "oorandom"
@@ -2885,9 +2889,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
dependencies = [
"unicode-ident",
]
@@ -2956,9 +2960,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.33"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
dependencies = [
"proc-macro2",
]
@@ -3138,7 +3142,7 @@ dependencies = [
"cc",
"libc",
"once_cell",
- "spin 0.5.2",
+ "spin",
"untrusted",
"web-sys",
"winapi",
@@ -3316,7 +3320,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -3338,7 +3342,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -3484,23 +3488,13 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
-
[[package]]
name = "spirv"
-version = "0.2.0+1.5.4"
+version = "0.3.0+sdk-1.3.268.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
dependencies = [
- "bitflags 1.3.2",
- "num-traits",
+ "bitflags 2.4.0",
]
[[package]]
@@ -3547,9 +3541,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.37"
+version = "2.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
dependencies = [
"proc-macro2",
"quote",
@@ -3611,9 +3605,9 @@ dependencies = [
[[package]]
name = "termcolor"
-version = "1.3.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
dependencies = [
"winapi-util",
]
@@ -3636,22 +3630,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.49"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -3788,7 +3782,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
@@ -4006,9 +4000,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",
@@ -4016,24 +4010,24 @@ 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",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
dependencies = [
"cfg-if",
"js-sys",
@@ -4043,9 +4037,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",
@@ -4053,22 +4047,22 @@ 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",
- "syn 2.0.37",
+ "syn 2.0.48",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[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"
@@ -4181,9 +4175,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.64"
+version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4225,19 +4219,19 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
[[package]]
name = "wgpu"
-version = "0.18.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24"
+checksum = "d0b71d2ded29e2161db50ab731d6cb42c037bd7ab94864a98fa66ff36b4721a8"
dependencies = [
"arrayvec",
"cfg-if",
- "flume",
+ "cfg_aliases",
"js-sys",
"log",
"naga",
"parking_lot",
"profiling",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
"smallvec",
"static_assertions",
"wasm-bindgen",
@@ -4250,19 +4244,22 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "0.18.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "837e02ddcdc6d4a9b56ba4598f7fd4202a7699ab03f6ef4dcdebfad2c966aea6"
+checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed"
dependencies = [
"arrayvec",
"bit-vec",
"bitflags 2.4.0",
+ "cfg_aliases",
"codespan-reporting",
+ "indexmap",
"log",
"naga",
+ "once_cell",
"parking_lot",
"profiling",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
"rustc-hash",
"smallvec",
"thiserror",
@@ -4273,9 +4270,9 @@ dependencies = [
[[package]]
name = "wgpu-hal"
-version = "0.18.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e30b9a8155c83868e82a8c5d3ce899de6c3961d2ef595de8fc168a1677fc2d8"
+checksum = "11f259ceb56727fb097da108d92f8a5cbdb5b74a77f9e396bd43626f67299d61"
dependencies = [
"android_system_properties",
"arrayvec",
@@ -4283,6 +4280,7 @@ dependencies = [
"bit-set",
"bitflags 2.4.0",
"block",
+ "cfg_aliases",
"core-graphics-types",
"d3d12",
"glow",
@@ -4303,7 +4301,7 @@ dependencies = [
"parking_lot",
"profiling",
"range-alloc",
- "raw-window-handle 0.5.2",
+ "raw-window-handle 0.6.0",
"renderdoc-sys",
"rustc-hash",
"smallvec",
@@ -4316,9 +4314,9 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "0.18.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd"
+checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2"
dependencies = [
"bitflags 2.4.0",
"js-sys",
@@ -4818,7 +4816,7 @@ checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.48",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 7c192fe194d9..9fa472ba6792 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,11 +51,10 @@ opt-level = 2
criterion = { version = "0.5.1", default-features = false }
glow = "0.13"
puffin = "0.18"
-raw-window-handle = "0.5.0"
+raw-window-handle = "0.6.0"
thiserror = "1.0.37"
-
-# Make the renderer `Sync` even on wasm32, because it makes the code simpler:
-wgpu = { version = "0.18.0", features = ["fragile-send-sync-non-atomic-wasm"] }
-
-# Use this to build wgpu with WebGL support on the Web *instead* of using WebGPU.
-#wgpu = { version = "0.18.0", features = ["webgl"] }
+wgpu = { version = "0.19", features = [
+ # Make the renderer `Sync` even on wasm32, because it makes the code simpler:
+ "fragile-send-sync-non-atomic-wasm",
+] }
+winit = { version = "0.29.4", default-features = false }
diff --git a/clippy.toml b/clippy.toml
index 1192b56ae2c7..93d7874068e8 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -71,5 +71,7 @@ disallowed-types = [
doc-valid-idents = [
# You must also update the same list in the root `clippy.toml`!
"AccessKit",
+ "WebGL",
+ "WebGPU",
"..",
]
diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml
index 07e10a5335df..c3158ee4e104 100644
--- a/crates/eframe/Cargo.toml
+++ b/crates/eframe/Cargo.toml
@@ -56,7 +56,14 @@ android-native-activity = ["egui-winit/android-native-activity"]
default_fonts = ["egui/default_fonts"]
## Use [`glow`](https://github.com/grovesNL/glow) for painting, via [`egui_glow`](https://github.com/emilk/egui/tree/master/crates/egui_glow).
-glow = ["dep:glow", "dep:egui_glow", "dep:glutin", "dep:glutin-winit"]
+glow = [
+ "dep:egui_glow",
+ "dep:glow",
+ "dep:glutin-winit",
+ "dep:glutin",
+ "dep:rwh_05",
+ "winit/rwh_05",
+]
## Enable saving app state to disk.
persistence = [
@@ -92,8 +99,19 @@ web_screen_reader = [
]
## Use [`wgpu`](https://docs.rs/wgpu) for painting (via [`egui-wgpu`](https://github.com/emilk/egui/tree/master/crates/egui-wgpu)).
+##
## This overrides the `glow` feature.
-wgpu = ["dep:wgpu", "dep:egui-wgpu", "dep:pollster", "dep:raw-window-handle"]
+##
+## By default, only WebGPU is enabled on web.
+## If you want to enable WebGL, you need to turn on the `webgl` feature of crate `wgpu`:
+##
+## ```ignore
+## wgpu = { version = "*", features = ["webgpu", "webgl"] }
+## ```
+##
+## By default, eframe will prefer WebGPU over WebGL, but
+## you can configure this at run-time with [`NativeOptions::wgpu_options`].
+wgpu = ["dep:wgpu", "dep:egui-wgpu", "dep:pollster"]
## Enables compiling for x11.
x11 = ["egui-winit/x11"]
@@ -109,6 +127,7 @@ egui = { version = "0.25.0", path = "../egui", default-features = false, feature
] }
log = { version = "0.4", features = ["std"] }
parking_lot = "0.12"
+raw-window-handle.workspace = true
static_assertions = "1.1.0"
thiserror.workspace = true
@@ -118,6 +137,10 @@ document-features = { version = "0.2", optional = true }
egui_glow = { version = "0.25.0", path = "../egui_glow", optional = true, default-features = false }
glow = { workspace = true, optional = true }
+# glutin stuck on old version of raw-window-handle:
+rwh_05 = { package = "raw-window-handle", version = "0.5.2", optional = true, features = [
+ "std",
+] }
ron = { version = "0.8", optional = true, features = ["integer128"] }
serde = { version = "1", optional = true, features = ["derive"] }
@@ -131,8 +154,7 @@ egui-winit = { version = "0.25.0", path = "../egui-winit", default-features = fa
image = { version = "0.24", default-features = false, features = [
"png",
] } # Needed for app icon
-raw-window-handle.workspace = true
-winit = { version = "0.29.4", default-features = false, features = ["rwh_05"] }
+winit = { workspace = true, default-features = false, features = ["rwh_06"] }
# optional native:
directories-next = { version = "2", optional = true }
@@ -211,5 +233,4 @@ web-sys = { version = "0.3.58", features = [
# optional web:
egui-wgpu = { version = "0.25.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit
-raw-window-handle = { workspace = true, optional = true }
wgpu = { workspace = true, optional = true }
diff --git a/crates/eframe/src/epi.rs b/crates/eframe/src/epi.rs
index 8f96b7962ebf..d34b1aecae50 100644
--- a/crates/eframe/src/epi.rs
+++ b/crates/eframe/src/epi.rs
@@ -15,7 +15,8 @@ pub use crate::native::winit_integration::UserEvent;
#[cfg(not(target_arch = "wasm32"))]
use raw_window_handle::{
- HasRawDisplayHandle, HasRawWindowHandle, RawDisplayHandle, RawWindowHandle,
+ DisplayHandle, HandleError, HasDisplayHandle, HasWindowHandle, RawDisplayHandle,
+ RawWindowHandle, WindowHandle,
};
#[cfg(not(target_arch = "wasm32"))]
use static_assertions::assert_not_impl_any;
@@ -76,30 +77,28 @@ pub struct CreationContext<'s> {
/// Raw platform window handle
#[cfg(not(target_arch = "wasm32"))]
- pub(crate) raw_window_handle: RawWindowHandle,
+ pub(crate) raw_window_handle: Result<RawWindowHandle, HandleError>,
/// Raw platform display handle for window
#[cfg(not(target_arch = "wasm32"))]
- pub(crate) raw_display_handle: RawDisplayHandle,
+ pub(crate) raw_display_handle: Result<RawDisplayHandle, HandleError>,
}
-// Implementing `Clone` would violate the guarantees of `HasRawWindowHandle` and `HasRawDisplayHandle`.
-#[cfg(not(target_arch = "wasm32"))]
-assert_not_impl_any!(CreationContext<'_>: Clone);
-
#[allow(unsafe_code)]
#[cfg(not(target_arch = "wasm32"))]
-unsafe impl HasRawWindowHandle for CreationContext<'_> {
- fn raw_window_handle(&self) -> RawWindowHandle {
- self.raw_window_handle
+impl HasWindowHandle for CreationContext<'_> {
+ fn window_handle(&self) -> Result<WindowHandle<'_>, HandleError> {
+ // Safety: the lifetime is correct.
+ unsafe { Ok(WindowHandle::borrow_raw(self.raw_window_handle.clone()?)) }
}
}
#[allow(unsafe_code)]
#[cfg(not(target_arch = "wasm32"))]
-unsafe impl HasRawDisplayHandle for CreationContext<'_> {
- fn raw_display_handle(&self) -> RawDisplayHandle {
- self.raw_display_handle
+impl HasDisplayHandle for CreationContext<'_> {
+ fn display_handle(&self) -> Result<DisplayHandle<'_>, HandleError> {
+ // Safety: the lifetime is correct.
+ unsafe { Ok(DisplayHandle::borrow_raw(self.raw_display_handle.clone()?)) }
}
}
@@ -599,30 +598,32 @@ pub struct Frame {
/// Raw platform window handle
#[cfg(not(target_arch = "wasm32"))]
- pub(crate) raw_window_handle: RawWindowHandle,
+ pub(crate) raw_window_handle: Result<RawWindowHandle, HandleError>,
/// Raw platform display handle for window
#[cfg(not(target_arch = "wasm32"))]
- pub(crate) raw_display_handle: RawDisplayHandle,
+ pub(crate) raw_display_handle: Result<RawDisplayHandle, HandleError>,
}
-// Implementing `Clone` would violate the guarantees of `HasRawWindowHandle` and `HasRawDisplayHandle`.
+// Implementing `Clone` would violate the guarantees of `HasWindowHandle` and `HasDisplayHandle`.
#[cfg(not(target_arch = "wasm32"))]
assert_not_impl_any!(Frame: Clone);
#[allow(unsafe_code)]
#[cfg(not(target_arch = "wasm32"))]
-unsafe impl HasRawWindowHandle for Frame {
- fn raw_window_handle(&self) -> RawWindowHandle {
- self.raw_window_handle
+impl HasWindowHandle for Frame {
+ fn window_handle(&self) -> Result<WindowHandle<'_>, HandleError> {
+ // Safety: the lifetime is correct.
+ unsafe { Ok(WindowHandle::borrow_raw(self.raw_window_handle.clone()?)) }
}
}
#[allow(unsafe_code)]
#[cfg(not(target_arch = "wasm32"))]
-unsafe impl HasRawDisplayHandle for Frame {
- fn raw_display_handle(&self) -> RawDisplayHandle {
- self.raw_display_handle
+impl HasDisplayHandle for Frame {
+ fn display_handle(&self) -> Result<DisplayHandle<'_>, HandleError> {
+ // Safety: the lifetime is correct.
+ unsafe { Ok(DisplayHandle::borrow_raw(self.raw_display_handle.clone()?)) }
}
}
diff --git a/crates/eframe/src/native/epi_integration.rs b/crates/eframe/src/native/epi_integration.rs
index e80785b5d375..e91278a39e80 100644
--- a/crates/eframe/src/native/epi_integration.rs
+++ b/crates/eframe/src/native/epi_integration.rs
@@ -4,7 +4,7 @@ use std::time::Instant;
use winit::event_loop::EventLoopWindowTarget;
-use raw_window_handle::{HasRawDisplayHandle as _, HasRawWindowHandle as _};
+use raw_window_handle::{HasDisplayHandle as _, HasWindowHandle as _};
use egui::{DeferredViewportUiCallback, NumExt as _, ViewportBuilder, ViewportId};
use egui_winit::{EventResponse, WindowSettings};
@@ -165,8 +165,8 @@ impl EpiIntegration {
gl,
#[cfg(feature = "wgpu")]
wgpu_render_state,
- raw_display_handle: window.raw_display_handle(),
- raw_window_handle: window.raw_window_handle(),
+ raw_display_handle: window.display_handle().map(|h| h.as_raw()),
+ raw_window_handle: window.window_handle().map(|h| h.as_raw()),
};
let icon = native_options
diff --git a/crates/eframe/src/native/glow_integration.rs b/crates/eframe/src/native/glow_integration.rs
index 6c2a0654c1ba..75820becf4ed 100644
--- a/crates/eframe/src/native/glow_integration.rs
+++ b/crates/eframe/src/native/glow_integration.rs
@@ -16,7 +16,6 @@ use glutin::{
prelude::{GlDisplay, PossiblyCurrentGlContext},
surface::GlSurface,
};
-use raw_window_handle::{HasRawDisplayHandle as _, HasRawWindowHandle as _};
use winit::{
event_loop::{EventLoop, EventLoopProxy, EventLoopWindowTarget},
window::{Window, WindowId},
@@ -126,7 +125,7 @@ struct Viewport {
// These three live and die together.
// TODO(emilk): clump them together into one struct!
gl_surface: Option<glutin::surface::Surface<glutin::surface::WindowSurface>>,
- window: Option<Rc<Window>>,
+ window: Option<Arc<Window>>,
egui_winit: Option<egui_winit::State>,
}
@@ -294,6 +293,9 @@ impl GlowWinitApp {
.expect("Single-use AppCreator has unexpectedly already been taken");
let app = {
+ // Use latest raw_window_handle for eframe compatibility
+ use raw_window_handle::{HasDisplayHandle as _, HasWindowHandle as _};
+
let window = glutin.window(ViewportId::ROOT);
let cc = CreationContext {
egui_ctx: integration.egui_ctx.clone(),
@@ -302,8 +304,8 @@ impl GlowWinitApp {
gl: Some(gl),
#[cfg(feature = "wgpu")]
wgpu_render_state: None,
- raw_display_handle: window.raw_display_handle(),
- raw_window_handle: window.raw_window_handle(),
+ raw_display_handle: window.display_handle().map(|h| h.as_raw()),
+ raw_window_handle: window.window_handle().map(|h| h.as_raw()),
};
crate::profile_scope!("app_creator");
app_creator(&cc)
@@ -373,7 +375,7 @@ impl WinitApp for GlowWinitApp {
self.running.as_ref().map(|r| &r.integration)
}
- fn window(&self, window_id: WindowId) -> Option<Rc<Window>> {
+ fn window(&self, window_id: WindowId) -> Option<Arc<Window>> {
let running = self.running.as_ref()?;
let glutin = running.glutin.borrow();
let viewport_id = *glutin.viewport_from_window.get(&window_id)?;
@@ -898,15 +900,18 @@ impl GlutinWindowContext {
gl_display.version_string(),
gl_display.supported_features()
);
- let raw_window_handle = window.as_ref().map(|w| w.raw_window_handle());
- log::debug!("creating gl context using raw window handle: {raw_window_handle:?}");
+ let glutin_raw_window_handle = window.as_ref().map(|w| {
+ use rwh_05::HasRawWindowHandle as _; // glutin stuck on old version of raw-window-handle
+ w.raw_window_handle()
+ });
+ log::debug!("creating gl context using raw window handle: {glutin_raw_window_handle:?}");
// create gl context. if core context cannot be created, try gl es context as fallback.
let context_attributes =
- glutin::context::ContextAttributesBuilder::new().build(raw_window_handle);
+ glutin::context::ContextAttributesBuilder::new().build(glutin_raw_window_handle);
let fallback_context_attributes = glutin::context::ContextAttributesBuilder::new()
.with_context_api(glutin::context::ContextApi::Gles(None))
- .build(raw_window_handle);
+ .build(glutin_raw_window_handle);
let gl_context_result = unsafe {
crate::profile_scope!("create_context");
@@ -952,7 +957,7 @@ impl GlutinWindowContext {
screenshot_requested: false,
viewport_ui_cb: None,
gl_surface: None,
- window: window.map(Rc::new),
+ window: window.map(Arc::new),
egui_winit: None,
},
);
@@ -1031,7 +1036,7 @@ impl GlutinWindowContext {
);
viewport.info.minimized = window.is_minimized();
viewport.info.maximized = Some(window.is_maximized());
- viewport.window.insert(Rc::new(window))
+ viewport.window.insert(Arc::new(window))
};
viewport.egui_winit.get_or_insert_with(|| {
@@ -1052,9 +1057,11 @@ impl GlutinWindowContext {
let (width_px, height_px): (u32, u32) = window.inner_size().into();
let width_px = std::num::NonZeroU32::new(width_px.at_least(1)).unwrap();
let height_px = std::num::NonZeroU32::new(height_px.at_least(1)).unwrap();
- let surface_attributes =
+ let surface_attributes = {
+ use rwh_05::HasRawWindowHandle as _; // glutin stuck on old version of raw-window-handle
glutin::surface::SurfaceAttributesBuilder::<glutin::surface::WindowSurface>::new()
- .build(window.raw_window_handle(), width_px, height_px);
+ .build(window.raw_window_handle(), width_px, height_px)
+ };
log::trace!("creating surface with attributes: {surface_attributes:?}");
let gl_surface = unsafe {
@@ -1120,7 +1127,7 @@ impl GlutinWindowContext {
.expect("viewport doesn't exist")
}
- fn window(&self, viewport_id: ViewportId) -> Rc<Window> {
+ fn window(&self, viewport_id: ViewportId) -> Arc<Window> {
self.viewport(viewport_id)
.window
.clone()
diff --git a/crates/eframe/src/native/wgpu_integration.rs b/crates/eframe/src/native/wgpu_integration.rs
index 395eb04297a8..79e94e527f1c 100644
--- a/crates/eframe/src/native/wgpu_integration.rs
+++ b/crates/eframe/src/native/wgpu_integration.rs
@@ -8,7 +8,7 @@
use std::{cell::RefCell, rc::Rc, sync::Arc, time::Instant};
use parking_lot::Mutex;
-use raw_window_handle::{HasRawDisplayHandle as _, HasRawWindowHandle as _};
+use raw_window_handle::{HasDisplayHandle as _, HasWindowHandle as _};
use winit::{
event_loop::{EventLoop, EventLoopProxy, EventLoopWindowTarget},
window::{Window, WindowId},
@@ -84,7 +84,7 @@ pub struct Viewport {
/// Window surface state that's initialized when the app starts running via a Resumed event
/// and on Android will also be destroyed if the application is paused.
- window: Option<Rc<Window>>,
+ window: Option<Arc<Window>>,
/// `window` and `egui_winit` are initialized together.
egui_winit: Option<egui_winit::State>,
@@ -170,9 +170,11 @@ impl WgpuWinitApp {
self.native_options.viewport.transparent.unwrap_or(false),
);
+ let window = Arc::new(window);
+
{
crate::profile_scope!("set_window");
- pollster::block_on(painter.set_window(ViewportId::ROOT, Some(&window)))?;
+ pollster::block_on(painter.set_window(ViewportId::ROOT, Some(window.clone())))?;
}
let wgpu_render_state = painter.render_state();
@@ -235,8 +237,8 @@ impl WgpuWinitApp {
#[cfg(feature = "glow")]
gl: None,
wgpu_render_state,
- raw_display_handle: window.raw_display_handle(),
- raw_window_handle: window.raw_window_handle(),
+ raw_display_handle: window.display_handle().map(|h| h.as_raw()),
+ raw_window_handle: window.window_handle().map(|h| h.as_raw()),
};
let app = {
crate::profile_scope!("user_app_creator");
@@ -260,7 +262,7 @@ impl WgpuWinitApp {
},
screenshot_requested: false,
viewport_ui_cb: None,
- window: Some(Rc::new(window)),
+ window: Some(window),
egui_winit: Some(egui_winit),
},
);
@@ -323,7 +325,7 @@ impl WinitApp for WgpuWinitApp {
self.running.as_ref().map(|r| &r.integration)
}
- fn window(&self, window_id: WindowId) -> Option<Rc<Window>> {
+ fn window(&self, window_id: WindowId) -> Option<Arc<Window>> {
self.running
.as_ref()
.and_then(|r| {
@@ -544,7 +546,8 @@ impl WgpuWinitRunning {
{
crate::profile_scope!("set_window");
- if let Err(err) = pollster::block_on(painter.set_window(viewport_id, Some(window)))
+ if let Err(err) =
+ pollster::block_on(painter.set_window(viewport_id, Some(window.clone())))
{
log::warn!("Failed to set window: {err}");
}
@@ -797,7 +800,10 @@ impl Viewport {
Ok(window) => {
windows_id.insert(window.id(), viewport_id);
- if let Err(err) = pollster::block_on(painter.set_window(viewport_id, Some(&window)))
+ let window = Arc::new(window);
+
+ if let Err(err) =
+ pollster::block_on(painter.set_window(viewport_id, Some(window.clone())))
{
log::error!("on set_window: viewport_id {viewport_id:?} {err}");
}
@@ -813,7 +819,7 @@ impl Viewport {
self.info.minimized = window.is_minimized();
self.info.maximized = Some(window.is_maximized());
- self.window = Some(Rc::new(window));
+ self.window = Some(window);
}
Err(err) => {
log::error!("Failed to create window: {err}");
@@ -930,7 +936,7 @@ fn render_immediate_viewport(
{
crate::profile_scope!("set_window");
- if let Err(err) = pollster::block_on(painter.set_window(ids.this, Some(window))) {
+ if let Err(err) = pollster::block_on(painter.set_window(ids.this, Some(window.clone()))) {
log::error!(
"when rendering viewport_id={:?}, set_window Error {err}",
ids.this
diff --git a/crates/eframe/src/native/winit_integration.rs b/crates/eframe/src/native/winit_integration.rs
index a7e4bb384b3e..541253c0818b 100644
--- a/crates/eframe/src/native/winit_integration.rs
+++ b/crates/eframe/src/native/winit_integration.rs
@@ -1,4 +1,4 @@
-use std::{rc::Rc, time::Instant};
+use std::{sync::Arc, time::Instant};
use winit::{
event_loop::EventLoopWindowTarget,
@@ -68,7 +68,7 @@ pub trait WinitApp {
fn integration(&self) -> Option<&EpiIntegration>;
- fn window(&self, window_id: WindowId) -> Option<Rc<Window>>;
+ fn window(&self, window_id: WindowId) -> Option<Arc<Window>>;
fn window_id_from_viewport_id(&self, id: ViewportId) -> Option<WindowId>;
diff --git a/crates/eframe/src/web/web_logger.rs b/crates/eframe/src/web/web_logger.rs
index bf9c5903229a..18936495581d 100644
--- a/crates/eframe/src/web/web_logger.rs
+++ b/crates/eframe/src/web/web_logger.rs
@@ -19,6 +19,21 @@ impl WebLogger {
impl log::Log for WebLogger {
fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
+ /// Never log anything less serious than a `INFO` from these crates.
+ const CRATES_AT_INFO_LEVEL: &[&str] = &[
+ // wgpu crates spam a lot on debug level, which is really annoying
+ "naga",
+ "wgpu_core",
+ "wgpu_hal",
+ ];
+
+ if CRATES_AT_INFO_LEVEL
+ .iter()
+ .any(|crate_name| metadata.target().starts_with(crate_name))
+ {
+ return metadata.level() <= log::LevelFilter::Info;
+ }
+
metadata.level() <= self.filter
}
diff --git a/crates/eframe/src/web/web_painter_wgpu.rs b/crates/eframe/src/web/web_painter_wgpu.rs
index d743b52c856f..2f4945e52706 100644
--- a/crates/eframe/src/web/web_painter_wgpu.rs
+++ b/crates/eframe/src/web/web_painter_wgpu.rs
@@ -1,5 +1,9 @@
use std::sync::Arc;
+use raw_window_handle::{
+ DisplayHandle, HandleError, HasDisplayHandle, HasWindowHandle, RawDisplayHandle,
+ RawWindowHandle, WebDisplayHandle, WebWindowHandle, WindowHandle,
+};
use wasm_bindgen::JsValue;
use web_sys::HtmlCanvasElement;
@@ -12,25 +16,33 @@ use super::web_painter::WebPainter;
struct EguiWebWindow(u32);
#[allow(unsafe_code)]
-unsafe impl raw_window_handle::HasRawWindowHandle for EguiWebWindow {
- fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle {
- let mut window_handle = raw_window_handle::WebWindowHandle::empty();
- window_handle.id = self.0;
- raw_window_handle::RawWindowHandle::Web(window_handle)
+impl HasWindowHandle for EguiWebWindow {
+ fn window_handle(&self) -> Result<WindowHandle<'_>, HandleError> {
+ // SAFETY: there is no lifetime here.
+ unsafe {
+ Ok(WindowHandle::borrow_raw(RawWindowHandle::Web(
+ WebWindowHandle::new(self.0),
+ )))
+ }
}
}
#[allow(unsafe_code)]
-unsafe impl raw_window_handle::HasRawDisplayHandle for EguiWebWindow {
- fn raw_display_handle(&self) -> raw_window_handle::RawDisplayHandle {
- raw_window_handle::RawDisplayHandle::Web(raw_window_handle::WebDisplayHandle::empty())
+impl HasDisplayHandle for EguiWebWindow {
+ fn display_handle(&self) -> Result<DisplayHandle<'_>, HandleError> {
+ // SAFETY: there is no lifetime here.
+ unsafe {
+ Ok(DisplayHandle::borrow_raw(RawDisplayHandle::Web(
+ WebDisplayHandle::new(),
+ )))
+ }
}
}
pub(crate) struct WebPainterWgpu {
canvas: HtmlCanvasElement,
canvas_id: String,
- surface: wgpu::Surface,
+ surface: wgpu::Surface<'static>,
surface_configuration: wgpu::SurfaceConfiguration,
render_state: Option<RenderState>,
on_surface_error: Arc<dyn Fn(wgpu::SurfaceError) -> SurfaceErrorAction>,
@@ -75,6 +87,15 @@ impl WebPainterWgpu {
pub async fn new(canvas_id: &str, options: &WebOptions) -> Result<Self, String> {
log::debug!("Creating wgpu painter");
+ {
+ let is_secure_context = web_sys::window().map_or(false, |w| w.is_secure_context());
+ if !is_secure_context {
+ log::info!(
+ "WebGPU is only available in secure contexts, i.e. on HTTPS and on localhost"
+ );
+ }
+ }
+
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: options.wgpu_options.supported_backends,
..Default::default()
@@ -82,20 +103,9 @@ impl WebPainterWgpu {
let canvas = super::canvas_element_or_die(canvas_id);
- let surface = if false {
- instance.create_surface_from_canvas(canvas.clone())
- } else {
- // Workaround for https://github.com/gfx-rs/wgpu/issues/3710:
- // Don't use `create_surface_from_canvas`, but `create_surface` instead!
- let raw_window = EguiWebWindow(egui::util::hash(("egui on wgpu", canvas_id)) as u32);
- canvas.set_attribute("data-raw-handle", &raw_window.0.to_string());
-
- #[allow(unsafe_code)]
- unsafe {
- instance.create_surface(&raw_window)
- }
- }
- .map_err(|err| format!("failed to create wgpu surface: {err}"))?;
+ let surface = instance
+ .create_surface(wgpu::SurfaceTarget::Canvas(canvas.clone()))
+ .map_err(|err| format!("failed to create wgpu surface: {err}"))?;
let depth_format = egui_wgpu::depth_format_from_bits(options.depth_buffer, 0);
let render_state =
@@ -103,14 +113,17 @@ impl WebPainterWgpu {
.await
.map_err(|err| err.to_string())?;
+ let (width, height) = (0, 0);
+
let surface_configuration = wgpu::SurfaceConfiguration {
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
format: render_state.target_format,
- width: 0,
- height: 0,
present_mode: options.wgpu_options.present_mode,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
view_formats: vec![render_state.target_format],
+ ..surface
+ .get_default_config(&render_state.adapter, width, height)
+ .ok_or("The surface isn't supported by this adapter")?
};
log::debug!("wgpu painter initialized.");
diff --git a/crates/egui-wgpu/Cargo.toml b/crates/egui-wgpu/Cargo.toml
index e83a66b0aa91..5b86dc09127d 100644
--- a/crates/egui-wgpu/Cargo.toml
+++ b/crates/egui-wgpu/Cargo.toml
@@ -51,8 +51,8 @@ wgpu.workspace = true
## Enable this when generating docs.
document-features = { version = "0.2", optional = true }
-winit = { version = "0.29.4", default-features = false, optional = true, features = [
- "rwh_05",
+winit = { workspace = true, optional = true, default-features = false, features = [
+ "rwh_06",
] }
# Native:
diff --git a/crates/egui-wgpu/src/lib.rs b/crates/egui-wgpu/src/lib.rs
index e73d4a0605be..6a43598da866 100644
--- a/crates/egui-wgpu/src/lib.rs
+++ b/crates/egui-wgpu/src/lib.rs
@@ -1,5 +1,17 @@
//! This crates provides bindings between [`egui`](https://github.com/emilk/egui) and [wgpu](https://crates.io/crates/wgpu).
//!
+//! If you're targeting WebGL you also need to turn on the
+//! `webgl` feature of the `wgpu` crate:
+//!
+//! ```ignore
+//! # Enable both WebGL and WebGPU backends on web.
+//! wgpu = { version = "*", features = ["webgpu", "webgl"] }
+//! ```
+//!
+//! You can control whether WebGL or WebGPU will be picked at runtime by setting
+//! [`WgpuConfiguration::supported_backends`].
+//! The default is to prefer WebGPU and fall back on WebGL.
+//!
//! ## Feature flags
#![cfg_attr(feature = "document-features", doc = document_features::document_features!())]
//!
@@ -21,6 +33,7 @@ use std::sync::Arc;
use epaint::mutex::RwLock;
+/// An error produced by egui-wgpu.
#[derive(thiserror::Error, Debug)]
pub enum WgpuError {
#[error("Failed to create wgpu adapter, no suitable adapter found.")]
@@ -34,6 +47,10 @@ pub enum WgpuError {
#[error(transparent)]
CreateSurfaceError(#[from] wgpu::CreateSurfaceError),
+
+ #[cfg(feature = "winit")]
+ #[error(transparent)]
+ HandleError(#[from] ::winit::raw_window_handle::HandleError),
}
/// Access to the render state for egui.
@@ -42,6 +59,13 @@ pub struct RenderState {
/// Wgpu adapter used for rendering.
pub adapter: Arc<wgpu::Adapter>,
+ /// All the available adapters.
+ ///
+ /// This is not available on web.
+ /// On web, we always select WebGPU is available, then fall back to WebGL if not.
+ #[cfg(not(target_arch = "wasm32"))]
+ pub available_adapters: Arc<[wgpu::Adapter]>,
+
/// Wgpu device used for rendering, created from the adapter.
pub device: Arc<wgpu::Device>,
@@ -63,14 +87,15 @@ impl RenderState {
pub async fn create(
config: &WgpuConfiguration,
instance: &wgpu::Instance,
- surface: &wgpu::Surface,
+ surface: &wgpu::Surface<'static>,
depth_format: Option<wgpu::TextureFormat>,
msaa_samples: u32,
) -> Result<Self, WgpuError> {
crate::profile_scope!("RenderState::create"); // async yield give bad names using `profile_function`
+ // This is always an empty list on web.
#[cfg(not(target_arch = "wasm32"))]
- let adapters: Vec<_> = instance.enumerate_adapters(wgpu::Backends::all()).collect();
+ let available_adapters = instance.enumerate_adapters(wgpu::Backends::all());
let adapter = {
crate::profile_scope!("request_adapter");
@@ -83,18 +108,18 @@ impl RenderState {
.await
.ok_or_else(|| {
#[cfg(not(target_arch = "wasm32"))]
- if adapters.is_empty() {
+ if available_adapters.is_empty() {
log::info!("No wgpu adapters found");
- } else if adapters.len() == 1 {
+ } else if available_adapters.len() == 1 {
log::info!(
"The only available wgpu adapter was not suitable: {}",
- adapter_info_summary(&adapters[0].get_info())
+ adapter_info_summary(&available_adapters[0].get_info())
);
} else {
log::info!(
"No suitable wgpu adapter found out of the {} available ones: {}",
- adapters.len(),
- describe_adapters(&adapters)
+ available_adapters.len(),
+ describe_adapters(&available_adapters)
);
}
@@ -109,7 +134,7 @@ impl RenderState {
);
#[cfg(not(target_arch = "wasm32"))]
- if adapters.len() == 1 {
+ if available_adapters.len() == 1 {
log::debug!(
"Picked the only available wgpu adapter: {}",
adapter_info_summary(&adapter.get_info())
@@ -117,8 +142,8 @@ impl RenderState {
} else {
log::info!(
"There were {} available wgpu adapters: {}",
- adapters.len(),
- describe_adapters(&adapters)
+ available_adapters.len(),
+ describe_adapters(&available_adapters)
);
log::debug!(
"Picked wgpu adapter: {}",
@@ -143,6 +168,8 @@ impl RenderState {
Ok(Self {
adapter: Arc::new(adapter),
+ #[cfg(not(target_arch = "wasm32"))]
+ available_adapters: available_adapters.into(),
device: Arc::new(device),
queue: Arc::new(queue),
target_format,
@@ -180,12 +207,19 @@ pub enum SurfaceErrorAction {
/// Configuration for using wgpu with eframe or the egui-wgpu winit feature.
///
-/// This can be configured with the environment variables:
+/// This can also be configured with the environment variables:
/// * `WGPU_BACKEND`: `vulkan`, `dx11`, `dx12`, `metal`, `opengl`, `webgpu`
/// * `WGPU_POWER_PREF`: `low`, `high` or `none`
#[derive(Clone)]
pub struct WgpuConfiguration {
- /// Backends that should be supported (wgpu will pick one of these)
+ /// Backends that should be supported (wgpu will pick one of these).
+ ///
+ /// For instance, if you only want to support WebGL (and not WebGPU),
+ /// you can set this to [`wgpu::Backends::GL`].
+ ///
+ /// By default on web, WebGPU will be used if available.
+ /// WebGL will only be used as a fallback,
+ /// and only if you have enabled the `webgl` feature of crate `wgpu`.
pub supported_backends: wgpu::Backends,
/// Configuration passed on device request, given an adapter
@@ -215,7 +249,7 @@ impl Default for WgpuConfiguration {
fn default() -> Self {
Self {
// Add GL backend, primarily because WebGPU is not stable enough yet.
- // (note however, that the GL backend needs to be opted-in via a wgpu feature flag)
+ // (note however, that the GL backend needs to be opted-in via the wgpu feature flag "webgl")
supported_backends: wgpu::util::backend_bits_from_env()
.unwrap_or(wgpu::Backends::PRIMARY | wgpu::Backends::GL),
@@ -228,8 +262,8 @@ impl Default for WgpuConfiguration {
wgpu::DeviceDescriptor {
label: Some("egui wgpu device"),
- features: wgpu::Features::default(),
- limits: wgpu::Limits {
+ required_features: wgpu::Features::default(),
+ required_limits: wgpu::Limits {
// When using a depth buffer, we have to be able to create a texture
// large enough for the entire surface, and we want to support 4k+ displays.
max_texture_dimension_2d: 8192,
diff --git a/crates/egui-wgpu/src/renderer.rs b/crates/egui-wgpu/src/renderer.rs
index fc6a668b9dbe..780c90866ac4 100644
--- a/crates/egui-wgpu/src/renderer.rs
+++ b/crates/egui-wgpu/src/renderer.rs
@@ -7,8 +7,14 @@ use epaint::{ahash::HashMap, emath::NumExt, PaintCallbackInfo, Primitive, Vertex
use wgpu;
use wgpu::util::DeviceExt as _;
+/// You can use this for storage when implementing [`CallbackTrait`].
pub type CallbackResources = type_map::concurrent::TypeMap;
+/// You can use this to do custom `wgpu` rendering in an egui app.
+///
+/// Implement [`CallbackTrait`] and call [`Callback::new_paint_callback`].
+///
+/// This can be turned into a [`epaint::PaintCallback`] and [`epaint::Shape`].
pub struct Callback(Box<dyn CallbackTrait>);
impl Callback {
diff --git a/crates/egui-wgpu/src/winit.rs b/crates/egui-wgpu/src/winit.rs
index 5cf71b64896f..15460686205a 100644
--- a/crates/egui-wgpu/src/winit.rs
+++ b/crates/egui-wgpu/src/winit.rs
@@ -5,7 +5,7 @@ use egui::{ViewportId, ViewportIdMap, ViewportIdSet};
use crate::{renderer, RenderState, SurfaceErrorAction, WgpuConfiguration};
struct SurfaceState {
- surface: wgpu::Surface,
+ surface: wgpu::Surface<'static>,
alpha_mode: wgpu::CompositeAlphaMode,
width: u32,
height: u32,
@@ -151,16 +151,23 @@ impl Painter {
} else {
wgpu::TextureUsages::RENDER_ATTACHMENT
};
+
+ let width = surface_state.width;
+ let height = surface_state.height;
+
surface_state.surface.configure(
&render_state.device,
&wgpu::SurfaceConfiguration {
+ // TODO(emilk): expose `desired_maximum_frame_latency` to eframe users
usage,
format: render_state.target_format,
- width: surface_state.width,
- height: surface_state.height,
present_mode,
alpha_mode: surface_state.alpha_mode,
view_formats: vec![render_state.target_format],
+ ..surface_state
+ .surface
+ .get_default_config(&render_state.adapter, width, height)
+ .expect("The surface isn't supported by this adapter")
},
);
}
@@ -189,79 +196,44 @@ impl Painter {
pub async fn set_window(
&mut self,
viewport_id: ViewportId,
- window: Option<&winit::window::Window>,
+ window: Option<Arc<winit::window::Window>>,
) -> Result<(), crate::WgpuError> {
- crate::profile_scope!("Painter::set_window"); // profle_function gives bad names for async functions
+ crate::profile_scope!("Painter::set_window"); // profile_function gives bad names for async functions
if let Some(window) = window {
let size = window.inner_size();
if self.surfaces.get(&viewport_id).is_none() {
- let surface = unsafe {
- crate::profile_scope!("create_surface");
- self.instance.create_surface(&window)?
- };
-
- let render_state = if let Some(render_state) = &self.render_state {
- render_state
- } else {
- let render_state = RenderState::create(
- &self.configuration,
- &self.instance,
- &surface,
- self.depth_format,
- self.msaa_samples,
- )
- .await?;
- self.render_state.get_or_insert(render_state)
- };
-
- let alpha_mode = if self.support_transparent_backbuffer {
- let supported_alpha_modes =
- surface.get_capabilities(&render_state.adapter).alpha_modes;
-
- // Prefer pre multiplied over post multiplied!
- if supported_alpha_modes.contains(&wgpu::CompositeAlphaMode::PreMultiplied) {
- wgpu::CompositeAlphaMode::PreMultiplied
- } else if supported_alpha_modes
- .contains(&wgpu::CompositeAlphaMode::PostMultiplied)
- {
- wgpu::CompositeAlphaMode::PostMultiplied
- } else {
- log::warn!("Transparent window was requested, but the active wgpu surface does not support a `CompositeAlphaMode` with transparency.");
- wgpu::CompositeAlphaMode::Auto
- }
- } else {
- wgpu::CompositeAlphaMode::Auto
- };
+ let surface = self.instance.create_surface(window)?;
+ self.add_surface(surface, viewport_id, size).await?;
+ }
+ } else {
+ log::warn!("No window - clearing all surfaces");
+ self.surfaces.clear();
+ }
+ Ok(())
+ }
- let supports_screenshot =
- !matches!(render_state.adapter.get_info().backend, wgpu::Backend::Gl);
-
- self.surfaces.insert(
- viewport_id,
- SurfaceState {
- surface,
- width: size.width,
- height: size.height,
- alpha_mode,
- supports_screenshot,
- },
- );
+ /// Updates (or clears) the [`winit::window::Window`] associated with the [`Painter`] without taking ownership of the window.
+ ///
+ /// Like [`set_window`](Self::set_window) except:
+ ///
+ /// # Safety
+ /// The user is responsible for ensuring that the window is alive for as long as it is set.
+ pub async unsafe fn set_window_unsafe(
+ &mut self,
+ viewport_id: ViewportId,
+ window: Option<&winit::window::Window>,
+ ) -> Result<(), crate::WgpuError> {
+ crate::profile_scope!("Painter::set_window_unsafe"); // profile_function gives bad names for async functions
- let Some(width) = NonZeroU32::new(size.width) else {
- log::debug!("The window width was zero; skipping generate textures");
- return Ok(());
- };
- let Some(height) = NonZeroU32::new(size.height) else {
- log::debug!("The window height was zero; skipping generate textures");
- return Ok(());
+ if let Some(window) = window {
+ let size = window.inner_size();
+ if self.surfaces.get(&viewport_id).is_none() {
+ let surface = unsafe {
+ self.instance
+ .create_surface_unsafe(wgpu::SurfaceTargetUnsafe::from_window(&window)?)?
};
-
- self.resize_and_generate_depth_texture_view_and_msaa_view(
- viewport_id,
- width,
- height,
- );
+ self.add_surface(surface, viewport_id, size).await?;
}
} else {
log::warn!("No window - clearing all surfaces");
@@ -270,6 +242,64 @@ impl Painter {
Ok(())
}
+ async fn add_surface(
+ &mut self,
+ surface: wgpu::Surface<'static>,
+ viewport_id: ViewportId,
+ size: winit::dpi::PhysicalSize<u32>,
+ ) -> Result<(), crate::WgpuError> {
+ let render_state = if let Some(render_state) = &self.render_state {
+ render_state
+ } else {
+ let render_state = RenderState::create(
+ &self.configuration,
+ &self.instance,
+ &surface,
+ self.depth_format,
+ self.msaa_samples,
+ )
+ .await?;
+ self.render_state.get_or_insert(render_state)
+ };
+ let alpha_mode = if self.support_transparent_backbuffer {
+ let supported_alpha_modes = surface.get_capabilities(&render_state.adapter).alpha_modes;
+
+ // Prefer pre multiplied over post multiplied!
+ if supported_alpha_modes.contains(&wgpu::CompositeAlphaMode::PreMultiplied) {
+ wgpu::CompositeAlphaMode::PreMultiplied
+ } else if supported_alpha_modes.contains(&wgpu::CompositeAlphaMode::PostMultiplied) {
+ wgpu::CompositeAlphaMode::PostMultiplied
+ } else {
+ log::warn!("Transparent window was requested, but the active wgpu surface does not support a `CompositeAlphaMode` with transparency.");
+ wgpu::CompositeAlphaMode::Auto
+ }
+ } else {
+ wgpu::CompositeAlphaMode::Auto
+ };
+ let supports_screenshot =
+ !matches!(render_state.adapter.get_info().backend, wgpu::Backend::Gl);
+ self.surfaces.insert(
+ viewport_id,
+ SurfaceState {
+ surface,
+ width: size.width,
+ height: size.height,
+ alpha_mode,
+ supports_screenshot,
+ },
+ );
+ let Some(width) = NonZeroU32::new(size.width) else {
+ log::debug!("The window width was zero; skipping generate textures");
+ return Ok(());
+ };
+ let Some(height) = NonZeroU32::new(size.height) else {
+ log::debug!("The window height was zero; skipping generate textures");
+ return Ok(());
+ };
+ self.resize_and_generate_depth_texture_view_and_msaa_view(viewport_id, width, height);
+ Ok(())
+ }
+
/// Returns the maximum texture dimension supported if known
///
/// This API will only return a known dimension after `set_window()` has been called
diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml
index 4b029e1f02a2..1324e8091a37 100644
--- a/crates/egui-winit/Cargo.toml
+++ b/crates/egui-winit/Cargo.toml
@@ -61,7 +61,7 @@ egui = { version = "0.25.0", path = "../egui", default-features = false, feature
log = { version = "0.4", features = ["std"] }
raw-window-handle.workspace = true
web-time = { version = "0.2" } # We use web-time so we can (maybe) compile for web
-winit = { version = "0.29.4", default-features = false, features = ["rwh_05"] }
+winit = { workspace = true, default-features = false, features = ["rwh_06"] }
#! ### Optional dependencies
diff --git a/crates/egui-winit/src/clipboard.rs b/crates/egui-winit/src/clipboard.rs
index bd0fa511ef83..7bb49283cc84 100644
--- a/crates/egui-winit/src/clipboard.rs
+++ b/crates/egui-winit/src/clipboard.rs
@@ -1,4 +1,4 @@
-use raw_window_handle::HasRawDisplayHandle;
+use raw_window_handle::RawDisplayHandle;
/// Handles interfacing with the OS clipboard.
///
@@ -26,7 +26,7 @@ pub struct Clipboard {
impl Clipboard {
/// Construct a new instance
- pub fn new(_display_target: &dyn HasRawDisplayHandle) -> Self {
+ pub fn new(_raw_display_handle: Option<RawDisplayHandle>) -> Self {
Self {
#[cfg(all(feature = "arboard", not(target_os = "android")))]
arboard: init_arboard(),
@@ -41,7 +41,7 @@ impl Clipboard {
),
feature = "smithay-clipboard"
))]
- smithay: init_smithay_clipboard(_display_target),
+ smithay: init_smithay_clipboard(_raw_display_handle),
clipboard: Default::default(),
}
@@ -135,15 +135,14 @@ fn init_arboard() -> Option<arboard::Clipboard> {
feature = "smithay-clipboard"
))]
fn init_smithay_clipboard(
- _display_target: &dyn HasRawDisplayHandle,
+ raw_display_handle: Option<RawDisplayHandle>,
) -> Option<smithay_clipboard::Clipboard> {
crate::profile_function!();
- use raw_window_handle::RawDisplayHandle;
- if let RawDisplayHandle::Wayland(display) = _display_target.raw_display_handle() {
+ if let Some(RawDisplayHandle::Wayland(display)) = raw_display_handle {
log::debug!("Initializing smithay clipboard…");
#[allow(unsafe_code)]
- Some(unsafe { smithay_clipboard::Clipboard::new(display.display) })
+ Some(unsafe { smithay_clipboard::Clipboard::new(display.display.as_ptr()) })
} else {
#[cfg(feature = "wayland")]
log::debug!("Cannot init smithay clipboard without a Wayland display handle");
diff --git a/crates/egui-winit/src/lib.rs b/crates/egui-winit/src/lib.rs
index 44dc58e695a9..6052c6931d35 100644
--- a/crates/egui-winit/src/lib.rs
+++ b/crates/egui-winit/src/lib.rs
@@ -22,7 +22,7 @@ mod window_settings;
pub use window_settings::WindowSettings;
-use raw_window_handle::HasRawDisplayHandle;
+use raw_window_handle::HasDisplayHandle;
#[allow(unused_imports)]
pub(crate) use profiling_scopes::*;
@@ -106,7 +106,7 @@ impl State {
pub fn new(
egui_ctx: egui::Context,
viewport_id: ViewportId,
- display_target: &dyn HasRawDisplayHandle,
+ display_target: &dyn HasDisplayHandle,
native_pixels_per_point: Option<f32>,
max_texture_side: Option<usize>,
) -> Self {
@@ -126,7 +126,9 @@ impl State {
any_pointer_button_down: false,
current_cursor_icon: None,
- clipboard: clipboard::Clipboard::new(display_target),
+ clipboard: clipboard::Clipboard::new(
+ display_target.display_handle().ok().map(|h| h.as_raw()),
+ ),
simulate_touch_screen: false,
pointer_touch_id: None,
diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml
index 878828cb262b..9ed73952f475 100644
--- a/crates/egui_demo_app/Cargo.toml
+++ b/crates/egui_demo_app/Cargo.toml
@@ -29,7 +29,7 @@ serde = ["dep:serde", "egui_demo_lib/serde", "egui/serde"]
syntect = ["egui_demo_lib/syntect"]
glow = ["eframe/glow"]
-wgpu = ["eframe/wgpu", "bytemuck"]
+wgpu = ["eframe/wgpu", "bytemuck", "dep:wgpu"]
[dependencies]
chrono = { version = "0.4", default-features = false, features = [
@@ -57,6 +57,8 @@ log = { version = "0.4", features = ["std"] }
bytemuck = { version = "1.7.1", optional = true }
puffin = { version = "0.18", optional = true }
puffin_http = { version = "0.15", optional = true }
+# Enable both WebGL & WebGPU when targeting the web (these features have no effect when not targeting wasm32)
+wgpu = { workspace = true, features = ["webgpu", "webgl"], optional = true }
# feature "http":
@@ -81,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/crates/egui_demo_app/src/backend_panel.rs b/crates/egui_demo_app/src/backend_panel.rs
index 591f5cc121f3..2e2f0f0a71c3 100644
--- a/crates/egui_demo_app/src/backend_panel.rs
+++ b/crates/egui_demo_app/src/backend_panel.rs
@@ -184,6 +184,103 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
ui.monospace(format!("{:#?}", _frame.info().web_info.location));
});
+ #[cfg(feature = "glow")]
+ if _frame.gl().is_some() {
+ ui.horizontal(|ui| {
+ ui.label("Renderer:");
+ ui.hyperlink_to("glow", "https://github.com/grovesNL/glow");
+ });
+ }
+
+ #[cfg(feature = "wgpu")]
+ if let Some(render_state) = _frame.wgpu_render_state() {
+ let wgpu_adapter_details_ui = |ui: &mut egui::Ui, adapter: &eframe::wgpu::Adapter| {
+ let info = &adapter.get_info();
+
+ let wgpu::AdapterInfo {
+ name,
+ vendor,
+ device,
+ device_type,
+ driver,
+ driver_info,
+ backend,
+ } = &info;
+
+ // Example values:
+ // > name: "llvmpipe (LLVM 16.0.6, 256 bits)", device_type: Cpu, backend: Vulkan, driver: "llvmpipe", driver_info: "Mesa 23.1.6-arch1.4 (LLVM 16.0.6)"
+ // > name: "Apple M1 Pro", device_type: IntegratedGpu, backend: Metal, driver: "", driver_info: ""
+ // > name: "ANGLE (Apple, Apple M1 Pro, OpenGL 4.1)", device_type: IntegratedGpu, backend: Gl, driver: "", driver_info: ""
+
+ egui::Grid::new("adapter_info").show(ui, |ui| {
+ ui.label("Backend:");
+ ui.label(format!("{backend:?}"));
+ ui.end_row();
+
+ ui.label("Device Type:");
+ ui.label(format!("{device_type:?}"));
+ ui.end_row();
+
+ if !name.is_empty() {
+ ui.label("Name:");
+ ui.label(format!("{name:?}"));
+ ui.end_row();
+ }
+ if !driver.is_empty() {
+ ui.label("Driver:");
+ ui.label(format!("{driver:?}"));
+ ui.end_row();
+ }
+ if !driver_info.is_empty() {
+ ui.label("Driver info:");
+ ui.label(format!("{driver_info:?}"));
+ ui.end_row();
+ }
+ if *vendor != 0 {
+ // TODO(emilk): decode using https://github.com/gfx-rs/wgpu/blob/767ac03245ee937d3dc552edc13fe7ab0a860eec/wgpu-hal/src/auxil/mod.rs#L7
+ ui.label("Vendor:");
+ ui.label(format!("0x{vendor:04X}"));
+ ui.end_row();
+ }
+ if *device != 0 {
+ ui.label("Device:");
+ ui.label(format!("0x{device:02X}"));
+ ui.end_row();
+ }
+ });
+ };
+
+ let wgpu_adapter_ui = |ui: &mut egui::Ui, adapter: &eframe::wgpu::Adapter| {
+ let info = &adapter.get_info();
+ ui.label(format!("{:?}", info.backend)).on_hover_ui(|ui| {
+ wgpu_adapter_details_ui(ui, adapter);
+ });
+ };
+
+ egui::Grid::new("wgpu_info").num_columns(2).show(ui, |ui| {
+ ui.label("Renderer:");
+ ui.hyperlink_to("wgpu", "https://wgpu.rs/");
+ ui.end_row();
+
+ ui.label("Backend:");
+ wgpu_adapter_ui(ui, &render_state.adapter);
+ ui.end_row();
+
+ #[cfg(not(target_arch = "wasm32"))]
+ if 1 < render_state.available_adapters.len() {
+ ui.label("Others:");
+ ui.vertical(|ui| {
+ for adapter in &*render_state.available_adapters {
+ if adapter.get_info() != render_state.adapter.get_info() {
+ wgpu_adapter_ui(ui, adapter);
+ }
+ }
+ });
+ ui.end_row();
+ }
+ });
+ }
+
#[cfg(not(target_arch = "wasm32"))]
{
ui.horizontal(|ui| {
@@ -214,15 +311,6 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
ui.close_menu();
}
});
-
- let fullscreen = ui.input(|i| i.viewport().fullscreen.unwrap_or(false));
- if !fullscreen
- && ui
- .button("Drag me to drag window")
- .is_pointer_button_down_on()
- {
- ui.ctx().send_viewport_cmd(egui::ViewportCommand::StartDrag);
- }
}
}
diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml
index 71fada476c3e..5174ee301612 100644
--- a/crates/egui_glow/Cargo.toml
+++ b/crates/egui_glow/Cargo.toml
@@ -40,7 +40,7 @@ links = ["egui-winit?/links"]
puffin = ["dep:puffin", "egui-winit?/puffin", "egui/puffin"]
## Enable [`winit`](https://docs.rs/winit) integration.
-winit = ["egui-winit"]
+winit = ["egui-winit", "dep:winit"]
[dependencies]
@@ -52,6 +52,10 @@ bytemuck = "1.7"
glow.workspace = true
log = { version = "0.4", features = ["std"] }
memoffset = "0.7"
+# glutin stuck on old version of raw-window-handle:
+rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [
+ "std",
+] }
#! ### Optional dependencies
## Enable this when generating docs.
@@ -61,6 +65,10 @@ document-features = { version = "0.2", optional = true }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
egui-winit = { version = "0.25.0", path = "../egui-winit", optional = true, default-features = false }
puffin = { workspace = true, optional = true }
+winit = { workspace = true, optional = true, default-features = false, features = [
+ "rwh_05", # glutin stuck on old version of raw-window-handle
+ "rwh_06", # for compatibility with egui-winit
+] }
# Web:
[target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -69,8 +77,7 @@ wasm-bindgen = "0.2"
[dev-dependencies]
-glutin = "0.31" # examples/pure_glow
-raw-window-handle.workspace = true
+glutin = "0.31" # examples/pure_glow
glutin-winit = "0.4.0"
diff --git a/crates/egui_glow/examples/pure_glow.rs b/crates/egui_glow/examples/pure_glow.rs
index 7d8b620b4814..eab04af1c5fb 100644
--- a/crates/egui_glow/examples/pure_glow.rs
+++ b/crates/egui_glow/examples/pure_glow.rs
@@ -24,7 +24,7 @@ impl GlutinWindowContext {
use glutin::display::GetGlDisplay;
use glutin::display::GlDisplay;
use glutin::prelude::GlSurface;
- use raw_window_handle::HasRawWindowHandle;
+ use rwh_05::HasRawWindowHandle;
let winit_window_builder = winit::window::WindowBuilder::new()
.with_resizable(true)
.with_inner_size(winit::dpi::LogicalSize {
diff --git a/scripts/build_demo_web.sh b/scripts/build_demo_web.sh
index e905066d42a1..6bf31452137c 100755
--- a/scripts/build_demo_web.sh
+++ b/scripts/build_demo_web.sh
@@ -18,7 +18,7 @@ OPEN=false
OPTIMIZE=false
BUILD=debug
BUILD_FLAGS=""
-WEB_GPU=false
+WGPU=false
WASM_OPT_FLAGS="-O2 --fast-math"
while test $# -gt 0; do
@@ -34,15 +34,15 @@ while test $# -gt 0; do
echo " --release: Build with --release, and then run wasm-opt."
echo " NOTE: --release also removes debug symbols, unless you also use -g."
echo ""
- echo " --webgpu: Build a binary for WebGPU instead of WebGL."
- echo " Note that the resulting wasm will ONLY work on browsers with WebGPU."
+ echo " --wgpu: Build a binary using wgpu instead of glow/webgl."
+ echo " The resulting binary will automatically use WebGPU if available and"
+ echo " fall back to a WebGL emulation layer otherwise."
exit 0
;;
-g)
shift
WASM_OPT_FLAGS="${WASM_OPT_FLAGS} -g"
- echo "'${WASM_OPT_FLAGS}'"
;;
--open)
@@ -57,9 +57,9 @@ while test $# -gt 0; do
BUILD_FLAGS="--release"
;;
- --webgpu)
+ --wgpu)
shift
- WEB_GPU=true
+ WGPU=true
;;
*)
@@ -71,7 +71,7 @@ done
OUT_FILE_NAME="egui_demo_app"
-if [[ "${WEB_GPU}" == true ]]; then
+if [[ "${WGPU}" == true ]]; then
FEATURES="${FEATURES},wgpu"
else
FEATURES="${FEATURES},glow"
@@ -87,6 +87,7 @@ echo "Building rust…"
(cd crates/$CRATE_NAME &&
cargo build \
${BUILD_FLAGS} \
+ --quiet \
--lib \
--target wasm32-unknown-unknown \
--no-default-features \
diff --git a/scripts/check.sh b/scripts/check.sh
index ab3063d91cab..a3f300223a2a 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -34,28 +34,28 @@ cargo check --quiet -p egui_demo_app --lib --target wasm32-unknown-unknown --al
cargo test --quiet --all-targets --all-features
cargo test --quiet --doc # slow - checks all doc-tests
-(cd crates/eframe && cargo check --quiet --no-default-features --features "glow")
-(cd crates/eframe && cargo check --quiet --no-default-features --features "wgpu")
-(cd crates/egui && cargo check --quiet --no-default-features --features "serde")
-(cd crates/egui_demo_app && cargo check --quiet --no-default-features --features "glow")
-(cd crates/egui_demo_app && cargo check --quiet --no-default-features --features "wgpu")
-(cd crates/egui_demo_lib && cargo check --quiet --no-default-features)
-(cd crates/egui_extras && cargo check --quiet --no-default-features)
-(cd crates/egui_glow && cargo check --quiet --no-default-features)
-(cd crates/egui-winit && cargo check --quiet --no-default-features --features "wayland")
-(cd crates/egui-winit && cargo check --quiet --no-default-features --features "x11")
-(cd crates/emath && cargo check --quiet --no-default-features)
-(cd crates/epaint && cargo check --quiet --no-default-features --release)
-(cd crates/epaint && cargo check --quiet --no-default-features)
-
-(cd crates/eframe && cargo check --quiet --all-features)
-(cd crates/egui && cargo check --quiet --all-features)
-(cd crates/egui_demo_app && cargo check --quiet --all-features)
-(cd crates/egui_extras && cargo check --quiet --all-features)
-(cd crates/egui_glow && cargo check --quiet --all-features)
-(cd crates/egui-winit && cargo check --quiet --all-features)
-(cd crates/emath && cargo check --quiet --all-features)
-(cd crates/epaint && cargo check --quiet --all-features)
+cargo check --quiet -p eframe --no-default-features --features "glow"
+cargo check --quiet -p eframe --no-default-features --features "wgpu"
+cargo check --quiet -p egui --no-default-features --features "serde"
+cargo check --quiet -p egui_demo_app --no-default-features --features "glow"
+cargo check --quiet -p egui_demo_app --no-default-features --features "wgpu"
+cargo check --quiet -p egui_demo_lib --no-default-features
+cargo check --quiet -p egui_extras --no-default-features
+cargo check --quiet -p egui_glow --no-default-features
+cargo check --quiet -p egui-winit --no-default-features --features "wayland"
+cargo check --quiet -p egui-winit --no-default-features --features "x11"
+cargo check --quiet -p emath --no-default-features
+cargo check --quiet -p epaint --no-default-features --release
+cargo check --quiet -p epaint --no-default-features
+
+cargo check --quiet -p eframe --all-features
+cargo check --quiet -p egui --all-features
+cargo check --quiet -p egui_demo_app --all-features
+cargo check --quiet -p egui_extras --all-features
+cargo check --quiet -p egui_glow --all-features
+cargo check --quiet -p egui-winit --all-features
+cargo check --quiet -p emath --all-features
+cargo check --quiet -p epaint --all-features
./scripts/wasm_bindgen_check.sh
diff --git a/scripts/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml
index 586209a775f0..aadfe75d83c9 100644
--- a/scripts/clippy_wasm/clippy.toml
+++ b/scripts/clippy_wasm/clippy.toml
@@ -45,5 +45,7 @@ disallowed-types = [
doc-valid-idents = [
# You must also update the same list in the root `clippy.toml`!
"AccessKit",
+ "WebGL",
+ "WebGPU",
"..",
]
diff --git a/scripts/setup_web.sh b/scripts/setup_web.sh
index e5dbb08fdbe4..36d39128b6ed 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
diff --git a/scripts/wasm_bindgen_check.sh b/scripts/wasm_bindgen_check.sh
index c36af407d111..d241cf2065ca 100755
--- a/scripts/wasm_bindgen_check.sh
+++ b/scripts/wasm_bindgen_check.sh
@@ -24,6 +24,7 @@ BUILD=debug # debug builds are faster
(cd crates/$CRATE_NAME &&
cargo build \
+ --quiet \
--lib \
--target wasm32-unknown-unknown \
--no-default-features \