Avoid panic when requesting to unmap a buffer that is pending mapping#1239
Merged
bors[bot] merged 1 commit intogfx-rs:masterfrom Feb 28, 2021
Merged
Avoid panic when requesting to unmap a buffer that is pending mapping#1239bors[bot] merged 1 commit intogfx-rs:masterfrom
bors[bot] merged 1 commit intogfx-rs:masterfrom
Conversation
kvark
approved these changes
Feb 28, 2021
Member
kvark
left a comment
There was a problem hiding this comment.
Doesn't look scary to me, thank you for digging into this!
bors r+
Contributor
bors bot
added a commit
that referenced
this pull request
Mar 1, 2021
1240: Fix issue with multiple queued mappings where the last one is not cancelled r=kvark a=Imberflur **Connections** Follow up from #1239 **Description** In #1239 I missed the case where there are multiple rounds of mapping/unmapping with the last map not being cancelled. In practice it doesn't occur very often, but I did encounter it with settings/a scene that created a heavy GPU load. Sorry for not catching this earlier! **Testing** Using `wgpu-rs` capture example, after the first `map_async` I added in an `unmap` followed by another `map_async`. <!-- Non-trivial functional changes would need to be tested through: - [wgpu-rs](https://github.com/gfx-rs/wgpu-rs) - test the examples. - [wgpu-native](https://github.com/gfx-rs/wgpu-native/) - check the generated C header for sanity. Ideally, a PR needs to link to the draft PRs in these projects with relevant modifications. See #666 for an example. If you can add a unit/integration test here in `wgpu`, that would be best. --> Co-authored-by: Imbris <imbrisf@gmail.com>
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
Fix for #1238
Description
This might not be the cleanest fix but it is quite minimal. I'm not sure what the exact intent is with the organization of things and with the async status enum, would be happy to hear critiques.
Testing
Tested against example in #1238