Properly handle the case where Navigator.gpu is undefined and WebGPU is the only compiled backend #6197
Conversation
This file contains 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
BGR360
commented
Sep 2, 2024
a1phyr
reviewed
Sep 3, 2024
Wumpf
requested changes
Sep 10, 2024
…U is the only compiled backend. Previously, `Instance::request_adapter` would invoke a wasm binding with an undefined arg0, thus crashing the program. Now it will cleanly return `None` instead. Fixes gfx-rs#6196.
BGR360
force-pushed
the
issue-6196-undefined-webgpu
branch
from
e4001a5 to
3ab65b4
Compare
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.
Connections
Fixes #6196.
Description
This PR fixes a bug where
wgpuwould "crash" in the browser (JavaScriptTypeErrorexception) when compiled withoutwebglsupport and the browser doesn't support WebGPU.Implementation
This PR changes
ContextWebGPUto avoid callingwgpu_syswith anundefinedGpuobject. InContextWebGpu::request_adapter, this involves immediately returningNoneifself.gpuis undefined in the browser.Testing
Please advise. I have no idea how to write an automated regression test for this kind of change. I could not find any
CONTRIBUTING.mdor likewise providing any guidelines.Additionally, I have not yet manually tested that this works. I will work on that.
EDIT: Okay I applied the patch to
wgpu0.20.1 locally and patchedeframeto use it, and it does successfully get past the problem.Checklist
cargo fmt.cargo clippy. If applicable, add:--target wasm32-unknown-unknown--target wasm32-unknown-emscriptencargo xtask testto run tests.--target wasm32-unknown-unknownas well ??CHANGELOG.md. See simple instructions inside file.