From b1f04c8544c650de3947955ca68f679535d249aa Mon Sep 17 00:00:00 2001
From: lucy96chen <47800040+lucy96chen@users.noreply.github.com>
Date: Wed, 15 Sep 2021 20:22:45 -0700
Subject: Allow D3D12Device to use an existing device handle (#1940)

* Added a new field for an existing device handle to IDevice::Desc; Modified D3D12Device::initialize to set the device stored in desc if it already exists instead of creating a new one

* Turned existingDeviceHandle into a struct containing an array of two elements; Updated D3D12Device::initialize to match changes to existingDeviceHandle; Updated comments

* Fixed style error for ExistingDeviceHandles struct
---
 tools/gfx/d3d12/render-d3d12.cpp | 44 ++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'tools')

diff --git a/tools/gfx/d3d12/render-d3d12.cpp b/tools/gfx/d3d12/render-d3d12.cpp
index feacc624d..d0423044f 100644
--- a/tools/gfx/d3d12/render-d3d12.cpp
+++ b/tools/gfx/d3d12/render-d3d12.cpp
@@ -4287,32 +4287,40 @@ Result D3D12Device::initialize(const Desc& desc)
         return SLANG_FAIL;
     }
 
-    FlagCombiner combiner;
-    // TODO: we should probably provide a command-line option
-    // to override UseDebug of default rather than leave it
-    // up to each back-end to specify.
+    if (desc.existingDeviceHandles.values[0] == 0)
+    {
+        FlagCombiner combiner;
+        // TODO: we should probably provide a command-line option
+        // to override UseDebug of default rather than leave it
+        // up to each back-end to specify.
 #if ENABLE_DEBUG_LAYER
-    combiner.add(DeviceCheckFlag::UseDebug, ChangeType::OnOff);                 ///< First try debug then non debug
+        combiner.add(DeviceCheckFlag::UseDebug, ChangeType::OnOff);                 ///< First try debug then non debug
 #else
-    combiner.add(DeviceCheckFlag::UseDebug, ChangeType::Off);                   ///< Don't bother with debug
+        combiner.add(DeviceCheckFlag::UseDebug, ChangeType::Off);                   ///< Don't bother with debug
 #endif
-    combiner.add(DeviceCheckFlag::UseHardwareDevice, ChangeType::OnOff);        ///< First try hardware, then reference
-    
-    const D3D_FEATURE_LEVEL featureLevel = D3D_FEATURE_LEVEL_11_0;
+        combiner.add(DeviceCheckFlag::UseHardwareDevice, ChangeType::OnOff);        ///< First try hardware, then reference
 
-    const int numCombinations = combiner.getNumCombinations();
-    for (int i = 0; i < numCombinations; ++i)
-    {
-        if (SLANG_SUCCEEDED(_createDevice(combiner.getCombination(i), UnownedStringSlice(desc.adapter), featureLevel, m_deviceInfo)))
+        const D3D_FEATURE_LEVEL featureLevel = D3D_FEATURE_LEVEL_11_0;
+
+        const int numCombinations = combiner.getNumCombinations();
+        for (int i = 0; i < numCombinations; ++i)
         {
-            break;
+            if (SLANG_SUCCEEDED(_createDevice(combiner.getCombination(i), UnownedStringSlice(desc.adapter), featureLevel, m_deviceInfo)))
+            {
+                break;
+            }
         }
-    }
 
-    if (!m_deviceInfo.m_adapter)
+        if (!m_deviceInfo.m_adapter)
+        {
+            // Couldn't find an adapter
+            return SLANG_FAIL;
+        }
+    }
+    else
     {
-        // Couldn't find an adapter
-        return SLANG_FAIL;
+        // Store the existing device handle in desc in m_deviceInfo
+        m_deviceInfo.m_device = (ID3D12Device*)desc.existingDeviceHandles.values[0];
     }
 
     // Set the device
-- 
cgit v1.2.3