VulkanDevice: Fix crash on SW renderer switch

stenzek · Dec 8, 2023 · bc2c296 · bc2c296
1 parent 8960cd6
commit bc2c296
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/util/vulkan_texture.cpp b/src/util/vulkan_texture.cpp
@@ -221,10 +221,12 @@ VkImageLayout VulkanTexture::GetVkLayout() const
 VkCommandBuffer VulkanTexture::GetCommandBufferForUpdate()
 {
   VulkanDevice& dev = VulkanDevice::GetInstance();
-  if (m_type != Type::Texture || m_use_fence_counter == dev.GetCurrentFenceCounter())
+  if ((m_type != Type::Texture && m_type != Type::DynamicTexture) ||
+      m_use_fence_counter == dev.GetCurrentFenceCounter())
   {
     // Console.WriteLn("Texture update within frame, can't use do beforehand");
-    dev.EndRenderPass();
+    if (dev.InRenderPass())
+      dev.EndRenderPass();
     return dev.GetCurrentCommandBuffer();
   }