From 77574d997084fd1bb27f72c4a7d8e6a8ae3d17db Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Fri, 8 Nov 2019 11:25:58 +0100
Subject: [PATCH] [d3d11] Don't query DXVK instance from adapter

---
 src/d3d11/d3d11_device.cpp  | 16 +++++++++-------
 src/d3d11/d3d11_device.h    | 12 +++++++-----
 src/d3d11/d3d11_interop.cpp |  2 +-
 src/d3d11/d3d11_main.cpp    |  6 +++---
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp
index dbff583d..3b55f27f 100644
--- a/src/d3d11/d3d11_device.cpp
+++ b/src/d3d11/d3d11_device.cpp
@@ -38,7 +38,7 @@ namespace dxvk {
     m_dxvkDevice    (pContainer->GetDXVKDevice()),
     m_dxvkAdapter   (m_dxvkDevice->adapter()),
     m_d3d11Formats  (m_dxvkAdapter),
-    m_d3d11Options  (m_dxvkAdapter->instance()->config(), m_dxvkDevice),
+    m_d3d11Options  (m_dxvkDevice->instance()->config(), m_dxvkDevice),
     m_dxbcOptions   (m_dxvkDevice, m_d3d11Options) {
     m_initializer = new D3D11Initializer(this);
     m_context     = new D3D11ImmediateContext(this, m_dxvkDevice);
@@ -1300,7 +1300,7 @@ namespace dxvk {
     
     UINT flId;
     for (flId = 0; flId < FeatureLevels; flId++) {
-      if (CheckFeatureLevelSupport(m_dxvkAdapter, pFeatureLevels[flId]))
+      if (CheckFeatureLevelSupport(m_dxvkDevice->instance(), m_dxvkAdapter, pFeatureLevels[flId]))
         break;
     }
 
@@ -1871,9 +1871,10 @@ namespace dxvk {
   
   
   bool D3D11Device::CheckFeatureLevelSupport(
+    const Rc<DxvkInstance>& instance,
     const Rc<DxvkAdapter>&  adapter,
           D3D_FEATURE_LEVEL featureLevel) {
-    if (featureLevel > GetMaxFeatureLevel(adapter))
+    if (featureLevel > GetMaxFeatureLevel(instance))
       return false;
     
     // Check whether all features are supported
@@ -2302,7 +2303,7 @@ namespace dxvk {
   }
 
 
-  D3D_FEATURE_LEVEL D3D11Device::GetMaxFeatureLevel(const Rc<DxvkAdapter>& Adapter) {
+  D3D_FEATURE_LEVEL D3D11Device::GetMaxFeatureLevel(const Rc<DxvkInstance>& pInstance) {
     static const std::array<std::pair<std::string, D3D_FEATURE_LEVEL>, 9> s_featureLevels = {{
       { "12_1", D3D_FEATURE_LEVEL_12_1 },
       { "12_0", D3D_FEATURE_LEVEL_12_0 },
@@ -2315,7 +2316,7 @@ namespace dxvk {
       { "9_1",  D3D_FEATURE_LEVEL_9_1  },
     }};
     
-    const std::string maxLevel = Adapter->instance()->config()
+    const std::string maxLevel = pInstance->config()
       .getOption<std::string>("d3d11.maxFeatureLevel");
     
     auto entry = std::find_if(s_featureLevels.begin(), s_featureLevels.end(),
@@ -2460,11 +2461,12 @@ namespace dxvk {
   
   D3D11DXGIDevice::D3D11DXGIDevice(
           IDXGIAdapter*       pAdapter,
-          DxvkAdapter*        pDxvkAdapter,
+    const Rc<DxvkInstance>&   pDxvkInstance,
+    const Rc<DxvkAdapter>&    pDxvkAdapter,
           D3D_FEATURE_LEVEL   FeatureLevel,
           UINT                FeatureFlags)
   : m_dxgiAdapter   (pAdapter),
-    m_dxvkInstance  (pDxvkAdapter->instance()),
+    m_dxvkInstance  (pDxvkInstance),
     m_dxvkAdapter   (pDxvkAdapter),
     m_dxvkDevice    (CreateDevice(FeatureLevel)),
     m_d3d11Device   (this, FeatureLevel, FeatureFlags),
diff --git a/src/d3d11/d3d11_device.h b/src/d3d11/d3d11_device.h
index e409f684..c0c43884 100644
--- a/src/d3d11/d3d11_device.h
+++ b/src/d3d11/d3d11_device.h
@@ -421,6 +421,7 @@ namespace dxvk {
     }
     
     static bool CheckFeatureLevelSupport(
+      const Rc<DxvkInstance>& instance,
       const Rc<DxvkAdapter>&  adapter,
             D3D_FEATURE_LEVEL featureLevel);
     
@@ -483,7 +484,7 @@ namespace dxvk {
     BOOL IsUnifiedMemoryArch();
 
     static D3D_FEATURE_LEVEL GetMaxFeatureLevel(
-      const Rc<DxvkAdapter>&        Adapter);
+      const Rc<DxvkInstance>&           pInstance);
     
   };
   
@@ -564,10 +565,11 @@ namespace dxvk {
   public:
     
     D3D11DXGIDevice(
-          IDXGIAdapter*       pAdapter,
-          DxvkAdapter*        pDxvkAdapter,
-          D3D_FEATURE_LEVEL   FeatureLevel,
-          UINT                FeatureFlags);
+            IDXGIAdapter*       pAdapter,
+      const Rc<DxvkInstance>&   pDxvkInstance,
+      const Rc<DxvkAdapter>&    pDxvkAdapter,
+            D3D_FEATURE_LEVEL   FeatureLevel,
+            UINT                FeatureFlags);
     
     ~D3D11DXGIDevice();
     
diff --git a/src/d3d11/d3d11_interop.cpp b/src/d3d11/d3d11_interop.cpp
index 98c5f457..8bb39dd3 100644
--- a/src/d3d11/d3d11_interop.cpp
+++ b/src/d3d11/d3d11_interop.cpp
@@ -43,7 +43,7 @@ namespace dxvk {
           VkDevice*             pDevice) {
     auto device   = m_device->GetDXVKDevice();
     auto adapter  = device->adapter();
-    auto instance = adapter->instance();
+    auto instance = device->instance();
     
     if (pDevice != nullptr)
       *pDevice = device->handle();
diff --git a/src/d3d11/d3d11_main.cpp b/src/d3d11/d3d11_main.cpp
index 8bdf0009..d3f6e0c8 100644
--- a/src/d3d11/d3d11_main.cpp
+++ b/src/d3d11/d3d11_main.cpp
@@ -32,7 +32,7 @@ extern "C" {
     // Try to find the corresponding Vulkan device for the DXGI adapter
     if (SUCCEEDED(pAdapter->QueryInterface(__uuidof(IDXGIDXVKAdapter), reinterpret_cast<void**>(&dxgiVkAdapter)))) {
       dxvkAdapter  = dxgiVkAdapter->GetDXVKAdapter();
-      dxvkInstance = dxvkAdapter->instance();
+      dxvkInstance = dxgiVkAdapter->GetDXVKInstance();
     } else {
       Logger::warn("D3D11CoreCreateDevice: Adapter is not a DXVK adapter");
       DXGI_ADAPTER_DESC desc;
@@ -71,7 +71,7 @@ extern "C" {
     for (flId = 0 ; flId < FeatureLevels; flId++) {
       Logger::info(str::format("D3D11CoreCreateDevice: Probing ", pFeatureLevels[flId]));
       
-      if (D3D11Device::CheckFeatureLevelSupport(dxvkAdapter, pFeatureLevels[flId]))
+      if (D3D11Device::CheckFeatureLevelSupport(dxvkInstance, dxvkAdapter, pFeatureLevels[flId]))
         break;
     }
     
@@ -86,7 +86,7 @@ extern "C" {
     try {
       Logger::info(str::format("D3D11CoreCreateDevice: Using feature level ", fl));
       Com<D3D11DXGIDevice> device = new D3D11DXGIDevice(
-        pAdapter, dxvkAdapter.ptr(), fl, Flags);
+        pAdapter, dxvkInstance, dxvkAdapter, fl, Flags);
       
       return device->QueryInterface(
         __uuidof(ID3D11Device),