Deduplicate submitted surfaces to avoid a vulkan deadlock/crash#5799
Merged
cwfitzgerald merged 2 commits intogfx-rs:trunkfrom Jun 12, 2024
Merged
Deduplicate submitted surfaces to avoid a vulkan deadlock/crash#5799cwfitzgerald merged 2 commits intogfx-rs:trunkfrom
cwfitzgerald merged 2 commits intogfx-rs:trunkfrom
Conversation
Elabajaba
commented
Jun 12, 2024
cwfitzgerald
pushed a commit
that referenced
this pull request
Jun 12, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 #5774
Description
wgpu-hal's vulkan implementataion requires that we only submit each used surface texture once. If we submit the same surface texture multiple times, it'll deadlock.
To fix this, use a hashmap keyed on the surface texture arc's raw pointers instead of a smallvec to deduplicate the surface textures before we submit them.
Testing
Tested against https://github.com/Elabajaba/wgpu-vk-surface-crash
Checklist
cargo fmt.cargo clippy. If applicable, add:--target wasm32-unknown-unknown--target wasm32-unknown-emscriptencargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.