From 0832bff67516c12cdcdcdf85f7437706f59d7d3d Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 27 Oct 2016 11:34:17 +0200
Subject: [PATCH] Use command queue that created a swapchain for writing to
 backbuffers

---
 renderdoc/driver/d3d12/d3d12_device.cpp | 44 ++++++++++++++++---------
 renderdoc/driver/d3d12/d3d12_device.h   | 10 +++---
 renderdoc/driver/dxgi/dxgi_wrapped.h    |  1 +
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index 3f801e971..e3904ae0f 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -327,11 +327,7 @@ WrappedID3D12Device::~WrappedID3D12Device()
 
   for(size_t i = 0; i < m_QueueFences.size(); i++)
   {
-    m_GPUSyncCounter++;
-
-    m_Queues[i]->Signal(m_QueueFences[i], m_GPUSyncCounter);
-    m_QueueFences[i]->SetEventOnCompletion(m_GPUSyncCounter, m_GPUSyncHandle);
-    WaitForSingleObject(m_GPUSyncHandle, 10000);
+    GPUSync(m_Queues[i], m_QueueFences[i]);
 
     SAFE_RELEASE(m_QueueFences[i]);
   }
@@ -696,6 +692,10 @@ IUnknown *WrappedID3D12Device::WrapSwapchainBuffer(WrappedIDXGISwapChain4 *swap,
 
     m_SwapChains[swap].rtvs[buffer] = rtv;
 
+    ID3DDevice *swapQ = swap->GetD3DDevice();
+    RDCASSERT(WrappedID3D12CommandQueue::IsAlloc(swapQ));
+    m_SwapChains[swap].queue = (WrappedID3D12CommandQueue *)swapQ;
+
     // start at -1 so that we know we've never presented before
     m_SwapChains[swap].lastPresentedBuffer = -1;
   }
@@ -968,8 +968,8 @@ HRESULT WrappedID3D12Device::Present(WrappedIDXGISwapChain4 *swap, UINT SyncInte
 
       list->Close();
 
-      ExecuteLists();
-      FlushLists();
+      ExecuteLists(swapInfo.queue);
+      FlushLists(false, swapInfo.queue);
     }
   }
 
@@ -1822,12 +1822,18 @@ void WrappedID3D12Device::DestroyInternalResources()
   CloseHandle(m_GPUSyncHandle);
 }
 
-void WrappedID3D12Device::GPUSync()
+void WrappedID3D12Device::GPUSync(ID3D12CommandQueue *queue, ID3D12Fence *fence)
 {
   m_GPUSyncCounter++;
 
-  HRESULT hr = m_Queue->Signal(m_GPUSyncFence, m_GPUSyncCounter);
-  m_GPUSyncFence->SetEventOnCompletion(m_GPUSyncCounter, m_GPUSyncHandle);
+  if(queue == NULL)
+    queue = GetQueue();
+
+  if(fence == NULL)
+    fence = m_GPUSyncFence;
+
+  HRESULT hr = queue->Signal(fence, m_GPUSyncCounter);
+  fence->SetEventOnCompletion(m_GPUSyncCounter, m_GPUSyncHandle);
   WaitForSingleObject(m_GPUSyncHandle, 10000);
 
   RDCASSERTEQUAL(hr, S_OK);
@@ -1867,10 +1873,13 @@ ID3D12GraphicsCommandList *WrappedID3D12Device::GetNewList()
   return ret;
 }
 
-void WrappedID3D12Device::ExecuteList(ID3D12GraphicsCommandList *list)
+void WrappedID3D12Device::ExecuteList(ID3D12GraphicsCommandList *list, ID3D12CommandQueue *queue)
 {
+  if(queue == NULL)
+    queue = GetQueue();
+
   ID3D12CommandList *l = list;
-  GetQueue()->ExecuteCommandLists(1, &l);
+  queue->ExecuteCommandLists(1, &l);
 
   for(auto it = m_InternalCmds.pendingcmds.begin(); it != m_InternalCmds.pendingcmds.end(); ++it)
   {
@@ -1884,7 +1893,7 @@ void WrappedID3D12Device::ExecuteList(ID3D12GraphicsCommandList *list)
   m_InternalCmds.submittedcmds.push_back(list);
 }
 
-void WrappedID3D12Device::ExecuteLists()
+void WrappedID3D12Device::ExecuteLists(ID3D12CommandQueue *queue)
 {
   // nothing to do
   if(m_InternalCmds.pendingcmds.empty())
@@ -1895,7 +1904,10 @@ void WrappedID3D12Device::ExecuteLists()
   for(size_t i = 0; i < cmds.size(); i++)
     cmds[i] = m_InternalCmds.pendingcmds[i];
 
-  GetQueue()->ExecuteCommandLists((UINT)cmds.size(), &cmds[0]);
+  if(queue == NULL)
+    queue = GetQueue();
+
+  queue->ExecuteCommandLists((UINT)cmds.size(), &cmds[0]);
 
   m_InternalCmds.submittedcmds.insert(m_InternalCmds.submittedcmds.end(),
                                       m_InternalCmds.pendingcmds.begin(),
@@ -1903,11 +1915,11 @@ void WrappedID3D12Device::ExecuteLists()
   m_InternalCmds.pendingcmds.clear();
 }
 
-void WrappedID3D12Device::FlushLists(bool forceSync)
+void WrappedID3D12Device::FlushLists(bool forceSync, ID3D12CommandQueue *queue)
 {
   if(!m_InternalCmds.submittedcmds.empty() || forceSync)
   {
-    GPUSync();
+    GPUSync(queue);
 
     if(!m_InternalCmds.submittedcmds.empty())
       m_InternalCmds.freecmds.insert(m_InternalCmds.freecmds.end(),
diff --git a/renderdoc/driver/d3d12/d3d12_device.h b/renderdoc/driver/d3d12/d3d12_device.h
index 2f304f1b6..939d680ee 100644
--- a/renderdoc/driver/d3d12/d3d12_device.h
+++ b/renderdoc/driver/d3d12/d3d12_device.h
@@ -318,6 +318,8 @@ private:
   {
     D3D12_CPU_DESCRIPTOR_HANDLE rtvs[8];
 
+    ID3D12CommandQueue *queue;
+
     int32_t lastPresentedBuffer;
   };
 
@@ -407,11 +409,11 @@ public:
   } m_InternalCmds;
 
   ID3D12GraphicsCommandList *GetNewList();
-  void ExecuteList(ID3D12GraphicsCommandList *list);
-  void ExecuteLists();
-  void FlushLists(bool forceSync = false);
+  void ExecuteList(ID3D12GraphicsCommandList *list, ID3D12CommandQueue *queue = NULL);
+  void ExecuteLists(ID3D12CommandQueue *queue = NULL);
+  void FlushLists(bool forceSync = false, ID3D12CommandQueue *queue = NULL);
 
-  void GPUSync();
+  void GPUSync(ID3D12CommandQueue *queue = NULL, ID3D12Fence *fence = NULL);
 
   void StartFrameCapture(void *dev, void *wnd);
   bool EndFrameCapture(void *dev, void *wnd);
diff --git a/renderdoc/driver/dxgi/dxgi_wrapped.h b/renderdoc/driver/dxgi/dxgi_wrapped.h
index d27c9d51e..401d331be 100644
--- a/renderdoc/driver/dxgi/dxgi_wrapped.h
+++ b/renderdoc/driver/dxgi/dxgi_wrapped.h
@@ -580,6 +580,7 @@ public:
     return NULL;
   }
 
+  ID3DDevice *GetD3DDevice() { return m_pDevice; }
   int GetNumBackbuffers() { return MAX_NUM_BACKBUFFERS; }
   IUnknown **GetBackbuffers() { return m_pBackBuffers; }
   IMPLEMENT_IDXGIOBJECT_WITH_REFCOUNTDXGIOBJECT_CUSTOMQUERY;