fix: handle Queue::submit non-fatally
#6318
Merged
+115
−24
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
ErichDonGubler
added
area: validation
This comment was marked as resolved.
This comment was marked as resolved.
ErichDonGubler
force-pushed
the
erichdongubler/push-lvknmkzzvkqt
branch
4 times, most recently
from
e1de5f4
to
4359575
Compare
This comment was marked as resolved.
This comment was marked as resolved.
ErichDonGubler
force-pushed
the
erichdongubler/push-lvknmkzzvkqt
branch
from
4359575
to
6f4f701
Compare
cwfitzgerald
approved these changes
Sep 24, 2024
* Change the signature of `wgpu_core::Global::queue_submit` to return a `(SubmissionIndex, …)` in addition to its current error type. * Change the control flow of errors in `Queue::submit` to break to the end of a block. This is similar to what we already do in many APIs in `wgpu_core`. * Hoist the scope of the local `submit_index` binding so it can be used at the point where we need to convert current error paths to also return the submission index. Later, we will likely want to avoid actually retrieving a new submission index so we can minimize the critical section of code. We'll need to figure out a strategy for returning a valid (but not necessarily unique) index in the case of failures that prevent successful submission.
ErichDonGubler
force-pushed
the
erichdongubler/push-lvknmkzzvkqt
branch
from
6f4f701
to
816c139
Compare
|
Nice, just started to need this in #6291 :) |
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 #6317, unblocks #5714.
Description
wgpu_core::Global::queue_submitto return a(SubmissionIndex, …)in addition to its current error type.Queue::submitto break to the end of a block. This is similar to what we already do in many APIs inwgpu_core.submit_indexbinding so it can be used at the point where we need to convert current error paths to also return the submission index.Later, we will likely want to avoid actually retrieving a new submission index so we can minimize the critical section of code. We'll need to figure out a strategy for returning a valid (but not necessarily unique) index in the case of failures that prevent successful submission.
It is strongly recommended that a reviewer review this diff with whitespace changes ignored.
Testing
Exercised by #6317. If a reviewer feels strongly, we can take the example from #5714 and turn it into a test.
Checklist
cargo fmt.cargo clippy. If applicable, add:--target wasm32-unknown-unknown--target wasm32-unknown-emscriptencargo xtask testto run tests.Add change toI don't think that this is necessary, since we haven't shipped this defect to Crates.io.CHANGELOG.md. See simple instructions inside file.