From 22f4e3fa290aae08049df2a350bd8d3ec0b91711 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 15 Nov 2019 11:36:56 +0000
Subject: [PATCH] Handle strange D3D12 singleton device per adapter behaviour.
 Refs #1595

---
 renderdoc/driver/d3d12/d3d12_device.cpp  | 30 ++++++++++++++++++++++++
 renderdoc/driver/d3d12/d3d12_device.h    |  6 +++++
 renderdoc/driver/d3d12/d3d12_hooks.cpp   |  2 +-
 renderdoc/driver/dxgi/dxgi_stringise.cpp |  1 +
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index 47a0a9624..12e8df158 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -40,6 +40,9 @@
 
 WRAPPED_POOL_INST(WrappedID3D12Device);
 
+Threading::CriticalSection WrappedID3D12Device::m_DeviceWrappersLock;
+std::map<ID3D12Device *, WrappedID3D12Device *> WrappedID3D12Device::m_DeviceWrappers;
+
 void WrappedID3D12Device::RemoveQueue(WrappedID3D12CommandQueue *queue)
 {
   auto it = std::remove_if(m_Queues.begin(), m_Queues.end(),
@@ -445,6 +448,11 @@ WrappedID3D12Device::WrappedID3D12Device(ID3D12Device *realDevice, D3D12InitPara
     RDCDEBUG("Couldn't get ID3D12InfoQueue.");
   }
 
+  {
+    SCOPED_LOCK(m_DeviceWrappersLock);
+    m_DeviceWrappers[m_pDevice] = this;
+  }
+
   if(!RenderDoc::Inst().IsReplayApp())
   {
     FirstFrame(NULL);
@@ -453,6 +461,11 @@ WrappedID3D12Device::WrappedID3D12Device(ID3D12Device *realDevice, D3D12InitPara
 
 WrappedID3D12Device::~WrappedID3D12Device()
 {
+  {
+    SCOPED_LOCK(m_DeviceWrappersLock);
+    m_DeviceWrappers.erase(m_pDevice);
+  }
+
   RenderDoc::Inst().RemoveDeviceFrameCapturer((ID3D12Device *)this);
 
   if(!m_InternalCmds.pendingcmds.empty())
@@ -530,6 +543,23 @@ WrappedID3D12Device::~WrappedID3D12Device()
     RenderDoc::Inst().GetCrashHandler()->UnregisterMemoryRegion(this);
 }
 
+WrappedID3D12Device *WrappedID3D12Device::Create(ID3D12Device *realDevice, D3D12InitParams params,
+                                                 bool enabledDebugLayer)
+{
+  {
+    SCOPED_LOCK(m_DeviceWrappersLock);
+
+    auto it = m_DeviceWrappers.find(realDevice);
+    if(it != m_DeviceWrappers.end())
+    {
+      it->second->AddRef();
+      return it->second;
+    }
+  }
+
+  return new WrappedID3D12Device(realDevice, params, enabledDebugLayer);
+}
+
 HRESULT WrappedID3D12Device::QueryInterface(REFIID riid, void **ppvObject)
 {
   // DEFINE_GUID(IID_IDirect3DDevice9, 0xd0223b96, 0xbf7a, 0x43fd, 0x92, 0xbd, 0xa4, 0x3b, 0xd,
diff --git a/renderdoc/driver/d3d12/d3d12_device.h b/renderdoc/driver/d3d12/d3d12_device.h
index 9ec3171ee..287a4912f 100644
--- a/renderdoc/driver/d3d12/d3d12_device.h
+++ b/renderdoc/driver/d3d12/d3d12_device.h
@@ -506,6 +506,9 @@ private:
 
   bool m_debugLayerEnabled;
 
+  static Threading::CriticalSection m_DeviceWrappersLock;
+  static std::map<ID3D12Device *, WrappedID3D12Device *> m_DeviceWrappers;
+
 public:
   static const int AllocPoolCount = 4;
   ALLOCATE_WITH_WRAPPED_POOL(WrappedID3D12Device, AllocPoolCount);
@@ -514,6 +517,9 @@ public:
   bool IsDebugLayerEnabled() const { return m_debugLayerEnabled; }
   virtual ~WrappedID3D12Device();
 
+  static WrappedID3D12Device *Create(ID3D12Device *realDevice, D3D12InitParams params,
+                                     bool enabledDebugLayer);
+
   UINT GetUnwrappedDescriptorIncrement(D3D12_DESCRIPTOR_HEAP_TYPE type)
   {
     return m_DescriptorIncrements[type];
diff --git a/renderdoc/driver/d3d12/d3d12_hooks.cpp b/renderdoc/driver/d3d12/d3d12_hooks.cpp
index 7306ccd46..415b547f8 100644
--- a/renderdoc/driver/d3d12/d3d12_hooks.cpp
+++ b/renderdoc/driver/d3d12/d3d12_hooks.cpp
@@ -343,7 +343,7 @@ private:
           dev = (ID3D12Device *)dev6;
         }
 
-        WrappedID3D12Device *wrap = new WrappedID3D12Device(dev, params, EnableDebugLayer);
+        WrappedID3D12Device *wrap = WrappedID3D12Device::Create(dev, params, EnableDebugLayer);
 
         RDCDEBUG("created wrapped device.");
 
diff --git a/renderdoc/driver/dxgi/dxgi_stringise.cpp b/renderdoc/driver/dxgi/dxgi_stringise.cpp
index 7d2ea8efa..499706cf6 100644
--- a/renderdoc/driver/dxgi/dxgi_stringise.cpp
+++ b/renderdoc/driver/dxgi/dxgi_stringise.cpp
@@ -207,6 +207,7 @@ rdcstr DoStringise(const long &el)
   switch(hr)
   {
     STRINGISE_ENUM(S_OK)
+    STRINGISE_ENUM(S_FALSE)
     STRINGISE_ENUM(DXGI_ERROR_INVALID_CALL)
     STRINGISE_ENUM(DXGI_ERROR_NOT_FOUND)
     STRINGISE_ENUM(DXGI_ERROR_DEVICE_REMOVED)