Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): don't panic on mapped buffer in queue_submit #3364

Merged
merged 3 commits into from
Jan 15, 2023
Merged

fix(core): don't panic on mapped buffer in queue_submit #3364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86cf6ec
fix(core): don't panic on mapped buffer in queue_submit
crowlKats Jan 9, 2023
0fbf6a7
CHANGELOG.md
crowlKats Jan 15, 2023
bf4ac7b
Merge branch 'master' into mapped_buffer_dont_panic
crowlKats Jan 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ Additionally `Surface::get_default_config` now returns an Option and returns Non
- Improve error messages when binding bind group with dynamic offsets. By @cwfitzgerald in [#3294](https://github.com/gfx-rs/wgpu/pull/3294)
- Allow non-filtering sampling of integer textures. By @JMS55 in [#3362](https://github.com/gfx-rs/wgpu/pull/3362).
- Validate texture ids in `Global::queue_texture_write`. By @jimblandy in [#3378](https://github.com/gfx-rs/wgpu/pull/3378).
- Don't panic on mapped buffer in queue_submit. By @crowlKats in [#3364](https://github.com/gfx-rs/wgpu/pull/3364).

#### Metal
- Fix texture view creation with full-resource views when using an explicit `mip_level_count` or `array_layer_count`. By @cwfitzgerald in [#3323](https://github.com/gfx-rs/wgpu/pull/3323)
Expand Down
4 changes: 3 additions & 1 deletion wgpu-core/src/device/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,8 @@ pub enum QueueSubmitError {
DestroyedTexture(id::TextureId),
#[error(transparent)]
Unmap(#[from] BufferAccessError),
#[error("Buffer {0:?} is still mapped")]
BufferStillMapped(id::BufferId),
#[error("surface output was dropped before the command buffer got submitted")]
SurfaceOutputDropped,
#[error("surface was unconfigured before the command buffer got submitted")]
Expand Down Expand Up @@ -910,7 +912,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
} else {
match buffer.map_state {
BufferMapState::Idle => (),
_ => panic!("Buffer {:?} is still mapped", id),
_ => return Err(QueueSubmitError::BufferStillMapped(id.0)),
}
}
}
Expand Down