nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-25 16:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if a texture is destroyed before queue submission (#5028)

Browse Source
This commit is contained in:
Nicolas Silva 2024-01-10 14:36:02 +01:00 committed by GitHub
parent c367adf3bf
commit f27bb443c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wgpu-core/src/command/memory_init.rs
View File

@ -11,7 +11,9 @@ use crate::{
FastHashMap,
};
use super::{clear::clear_texture, BakedCommands, DestroyedBufferError, DestroyedTextureError};
use super::{
clear::clear_texture, BakedCommands, ClearError, DestroyedBufferError, DestroyedTextureError,
};
/// Surface that was discarded by `StoreOp::Discard` of a preceding renderpass.
/// Any read access to this surface needs to be preceded by a texture initialization.
@ -301,15 +303,26 @@ impl<A: HalApi> BakedCommands<A> {
// TODO: Could we attempt some range collapsing here?
for range in ranges.drain(..) {
clear_texture(
let clear_result = clear_texture(
&texture_use.texture,
range,
&mut self.encoder,
&mut device_tracker.textures,
&device.alignments,
device.zero_buffer.as_ref().unwrap(),
)
.unwrap();
);
// A Texture can be destroyed between the command recording
// and now, this is out of our control so we have to handle
// it gracefully.
if let Err(ClearError::InvalidTexture(id)) = clear_result {
return Err(DestroyedTextureError(id));
}
// Other errors are unexpected.
if let Err(error) = clear_result {
panic!("{error}");
}
}
}