D3D12Device: Fix crash when using media capture

stenzek · Sep 9, 2024 · de551c1 · de551c1
1 parent 559aff0
commit de551c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/util/d3d12_device.cpp b/src/util/d3d12_device.cpp
@@ -556,6 +556,7 @@ ID3D12GraphicsCommandList4* D3D12Device::GetInitCommandList()
 
 void D3D12Device::SubmitCommandList(bool wait_for_completion)
 {
+  DebugAssert(!InRenderPass());
   if (m_device_was_lost) [[unlikely]]
     return;
 

diff --git a/src/util/d3d12_texture.cpp b/src/util/d3d12_texture.cpp
@@ -996,9 +996,15 @@ void D3D12DownloadTexture::Flush()
 
   // Need to execute command buffer.
   if (dev.GetCurrentFenceValue() == m_copy_fence_value)
+  {
+    if (dev.InRenderPass())
+      dev.EndRenderPass();
     dev.SubmitCommandList(true);
+  }
   else
+  {
     dev.WaitForFence(m_copy_fence_value);
+  }
 }
 
 void D3D12DownloadTexture::SetDebugName(std::string_view name)
-Original file line number
+Diff line change
@@ Expand Up @@
     void D3D12Device::SubmitCommandList(bool wait_for_completion)
     {
+      DebugAssert(!InRenderPass());
       if (m_device_was_lost) [[unlikely]]
         return;
@@ Expand Down @@