Update to wgpu 25 #6744
Merged
Update to wgpu 25 #6744
+153
−101
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
torokati44
commented
Apr 14, 2025
torokati44
commented
Apr 14, 2025
torokati44
commented
Apr 14, 2025
torokati44
force-pushed
the
wgpu-25
branch
2 times, most recently
from
4ebc603 to
f571ee2
Compare
|
Preview available at https://egui-pr-preview.github.io/pr/6744-wgpu-25 |
mikialex
added a commit
to mikialex/rendiation
that referenced
this pull request
Apr 15, 2025
mikialex
added a commit
to mikialex/rendiation
that referenced
this pull request
Apr 17, 2025
emilk
reviewed
Apr 22, 2025
Merged
emilk
pushed a commit
that referenced
this pull request
Apr 24, 2025
Prerequisite of #6744. See: gfx-rs/wgpu#7218, gfx-rs/wgpu#7425 Please be aware that Rust 1.84 enables some (more) WASM extensions by default, and ships with an `std` built with them enabled: https://blog.rust-lang.org/2024/09/24/webassembly-targets-change-in-default-target-features/ According to `rustc +1.84 --print=cfg --target wasm32-unknown-unknown`, these are: `multivalue`, `mutable-globals`, `reference-types`, and `sign-ext`. (c.f. `rustc +1.84 --print=cfg --target wasm32-unknown-unknown -C target-cpu=mvp` enabling none.) For reference: https://webassembly.org/features/ ---- If support is desired for ancient/esoteric browsers that don't have these implemented, there are two ways to get around this: - Target `wasm32v1-none` instead, but that's a `no-std` target, and I suppose a lot of dependencies don't work that way (e.g. gfx-rs/wgpu#6826) - Using the `-Ctarget-cpu=mvp` and `-Zbuild-std=panic_abort,std` flags, and the `RUSTC_BOOTSTRAP=1` escape hatch to allow using the latter with non-`nightly` toolchains - until https://github.com/rust-lang/wg-cargo-std-aware is stabilized. (For reference: https://github.com/ruffle-rs/ruffle/pull/18528/files#diff-fb2896d189d77b35ace9a079c1ba9b55777d16e0f11ce79f776475a451b1825a) I don't think either of these is particularly advantageous, so I suggest just accepting that browsers will have to have some extensions implemented to run `egui`.
torokati44
force-pushed
the
wgpu-25
branch
2 times, most recently
from
dafe378 to
2059f4a
Compare
torokati44
commented
Apr 25, 2025
crates/egui-wgpu/src/lib.rs
Outdated
| WgpuError::NoSuitableAdapterFound("`request_adapters` returned `None`".to_owned()) | ||
| WgpuError::NoSuitableAdapterFound(format!("`request_adapters` returned `Err`: {}", e)) |
There was a problem hiding this comment.
Perhaps it would be better to do this...?
pub enum WgpuError {
#[error(transparent)]
NoSuitableAdapterFound(#[from] wgpu::RequestDeviceError),But then that would spread into NativeAdapterSelectorMethod...
There was a problem hiding this comment.
I solved that now by exposing this as a separate error 🤷
torokati44
commented
Apr 25, 2025
| @@ -195,12 +186,9 @@ impl Default for WgpuSetupCreateNew { | |||
| ..base_limits | |||
| }, | |||
| memory_hints: wgpu::MemoryHints::default(), | |||
| trace: wgpu::Trace::Off, | |||
There was a problem hiding this comment.
This is loss of functionality - but unfortunately, wgpu::Trace::Directory(std::path::PathBuf) is behind the wgpu-core/trace feature, and I couldn't find a way to check for it being enabled using cfg!, and to add another feature (such as wgpu-trace) to enable it, wgpu-core would also have to be declared as a direct dependency, and... 😵💫
There was a problem hiding this comment.
It's not exposed right now because the feature is a bit on hiatus right now gfx-rs/wgpu#5974
it's still used by Mozilla internally which uses wgpu-core (rather than wgpu)
…user provided adapter selection
Wumpf
approved these changes
May 10, 2025
mikialex
added a commit
to mikialex/rendiation
that referenced
this pull request
Jun 23, 2025
Merged
mikialex
added a commit
to mikialex/rendiation
that referenced
this pull request
Jul 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See for changelogs: