From 898e4e00280bf51588fb7aef3650e57bf58bb862 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 8 Jan 2025 10:25:41 +0000
Subject: [PATCH] Fix missing queue use in FlushLists call

---
 renderdoc/driver/d3d12/d3d12_device.cpp | 4 ++--
 renderdoc/driver/d3d12/d3d12_device.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index 0bec315bb0..570686260f 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -4777,14 +4777,14 @@ void WrappedID3D12Device::ExecuteLists(WrappedID3D12CommandQueue *queue, bool In
   m_InternalCmds.pendingcmds.clear();
 }
 
-void WrappedID3D12Device::FlushLists(bool forceSync, ID3D12CommandQueue *queue)
+void WrappedID3D12Device::FlushLists(bool forceSync)
 {
   if(HasFatalError())
     return;
 
   if(!m_InternalCmds.submittedcmds.empty() || forceSync)
   {
-    QueueWaitForIdle(queue, m_WFIFence);
+    QueueWaitForIdle(m_Queue, m_WFIFence);
 
     if(!m_InternalCmds.submittedcmds.empty())
       m_InternalCmds.freecmds.append(m_InternalCmds.submittedcmds);
diff --git a/renderdoc/driver/d3d12/d3d12_device.h b/renderdoc/driver/d3d12/d3d12_device.h
index 1811fe0474..dbe7a55dab 100644
--- a/renderdoc/driver/d3d12/d3d12_device.h
+++ b/renderdoc/driver/d3d12/d3d12_device.h
@@ -1069,7 +1069,7 @@ class WrappedID3D12Device : public IFrameCapturer, public ID3DDevice, public ID3
                    bool InFrameCaptureBoundary = false);
   void MarkListExecuted(ID3D12GraphicsCommandListX *list);
   void ExecuteLists(WrappedID3D12CommandQueue *queue = NULL, bool InFrameCaptureBoundary = false);
-  void FlushLists(bool forceSync = false, ID3D12CommandQueue *queue = NULL);
+  void FlushLists(bool forceSync = false);
 
   void DataUploadSync();