mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-22 07:21:04 +01:00
Deduplicate submitted surfaces to avoid a vulkan deadlock/crash (#5799)
This commit is contained in:
1 parent
6f1507ff7c
commit
c8b88767a4
1 file changed
+10
-4
@@ -1172,7 +1172,9 @@ impl Global {
|
||||
|
||||
let mut used_surface_textures = track::TextureUsageScope::default();
|
||||
|
||||
let mut submit_surface_textures_owned = SmallVec::<[_; 2]>::new();
|
||||
// Use a hashmap here to deduplicate the surface textures that are used in the command buffers.
|
||||
// This avoids vulkan deadlocking from the same surface texture being submitted multiple times.
|
||||
let mut submit_surface_textures_owned = FastHashMap::default();
|
||||
|
||||
{
|
||||
let mut command_buffer_guard = hub.command_buffers.write();
|
||||
@@ -1279,7 +1281,9 @@ impl Global {
|
||||
Some(TextureInner::Native { .. }) => false,
|
||||
Some(TextureInner::Surface { ref raw, .. }) => {
|
||||
if raw.is_some() {
|
||||
submit_surface_textures_owned.push(texture.clone());
|
||||
// Compare the Arcs by pointer as Textures don't implement Eq.
|
||||
submit_surface_textures_owned
|
||||
.insert(Arc::as_ptr(&texture), texture.clone());
|
||||
}
|
||||
|
||||
true
|
||||
@@ -1472,7 +1476,9 @@ impl Global {
|
||||
Some(TextureInner::Native { .. }) => {}
|
||||
Some(TextureInner::Surface { ref raw, .. }) => {
|
||||
if raw.is_some() {
|
||||
submit_surface_textures_owned.push(texture.clone());
|
||||
// Compare the Arcs by pointer as Textures don't implement Eq
|
||||
submit_surface_textures_owned
|
||||
.insert(Arc::as_ptr(texture), texture.clone());
|
||||
}
|
||||
|
||||
unsafe {
|
||||
@@ -1517,7 +1523,7 @@ impl Global {
|
||||
let mut submit_surface_textures =
|
||||
SmallVec::<[_; 2]>::with_capacity(submit_surface_textures_owned.len());
|
||||
|
||||
for texture in &submit_surface_textures_owned {
|
||||
for texture in submit_surface_textures_owned.values() {
|
||||
submit_surface_textures.extend(match texture.inner.get(&snatch_guard) {
|
||||
Some(TextureInner::Surface { raw, .. }) => raw.as_ref(),
|
||||
_ => None,
|
||||
|
||||
Reference in new issue
Block a user