Properly Deal with Timeouts #7030
Open
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
|
I looked at the |
# Conflicts: # wgpu/src/lib.rs
Wumpf
approved these changes
Feb 11, 2025
| gl: wgpu::GlBackendOptions::from_env_or_default(), | ||
| gl: wgpu::GlBackendOptions { | ||
| fence_behavior: if cfg!(target_family = "wasm") { | ||
| wgpu::GlFenceBehavior::AutoFinish |
There was a problem hiding this comment.
where in the tests are we relying on this, what would break if we use Normal. Plz add comment
Comment on lines
+1881
to
+1882
| // After the wait, the queue should be empty. | ||
| break 'error E::GpuWaitTimeout; |
There was a problem hiding this comment.
worth a debug assert since this would be an implementation error, no?
| let result = if queue_empty { | ||
| if let Some(wait_submission_index) = wait_submission_index { | ||
| // Assert to ensure that if we received a queue empty status, the fence shows the correct value. | ||
| // This is defencive, as this should never be hit. |
There was a problem hiding this comment.
Suggested change
| // This is defencive, as this should never be hit. | |
| // This is defensive, as this should never be hit. |
| @@ -370,73 +370,133 @@ impl Device { | |||
| assert!(self.queue.set(Arc::downgrade(queue)).is_ok()); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
added comments in this file help a lot, thanks!
| } | ||
| } | ||
| } | ||
|
|
||
| /// Result of a maintain operation. | ||
| pub enum MaintainResult { | ||
| /// Error states after a poll |
There was a problem hiding this comment.
Suggested change
| /// Error states after a poll | |
| /// Error states after a device poll |
| Timeout, | ||
| } | ||
|
|
||
| /// Status of poll operation. |
There was a problem hiding this comment.
Suggested change
| /// Status of poll operation. | |
| /// Status of device poll operation. |
| Self::Wait => Maintain::Wait, | ||
| Self::Poll => Maintain::Poll, | ||
| Self::WaitForSubmissionIndex(i) => PollType::WaitForSubmissionIndex(func(i)), | ||
| Self::Wait => PollType::Wait, |
There was a problem hiding this comment.
I'm kinda tempted to take the opportunity and bake the "non-webgpu-ness" of those wait operations into the names, but I don't know how to do so without making things worse 🤷
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
Close #3601
Close #4589
Description
Describe what problem this is solving, and how it's solved.
Testing
Explain how this change is tested.
Checklist
cargo fmt.taplo format.cargo clippy. If applicable, add:--target wasm32-unknown-unknowncargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.