From c8b88767a49a15e8ef0fd6350de11d2dffe51c9c Mon Sep 17 00:00:00 2001 From: Elabajaba Date: Wed, 12 Jun 2024 14:39:26 -0400 Subject: [PATCH] Deduplicate submitted surfaces to avoid a vulkan deadlock/crash (#5799) --- wgpu-core/src/device/queue.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/wgpu-core/src/device/queue.rs b/wgpu-core/src/device/queue.rs index a78bab836..e6b50dd64 100644 --- a/wgpu-core/src/device/queue.rs +++ b/wgpu-core/src/device/queue.rs @@ -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,