Revert "Fix memory leak during D3D12 capture (#2740)" (#2771)

bradgrantham-lunarg · web-flow · commit 4e08f050c113 · 2026-03-10T16:55:54.000-07:00
This reverts commit 865a785.
diff --git a/framework/decode/dx12_replay_consumer_base.cpp b/framework/decode/dx12_replay_consumer_base.cpp
@@ -1537,14 +1537,16 @@ void Dx12ReplayConsumerBase::InitializeD3D12Device(HandlePointerDecoder<void*>*
 
 void Dx12ReplayConsumerBase::DetectAdapters()
 {
-    graphics::dx12::IDXGIFactory1ComPtr factory1 = nullptr;
+    IDXGIFactory1* factory1 = nullptr;
 
-    HRESULT result = CreateDXGIFactory1(IID_PPV_ARGS(&factory1));
+    HRESULT result = CreateDXGIFactory1(IID_IDXGIFactory1, reinterpret_cast<void**>(&factory1));
 
     if (SUCCEEDED(result))
     {
-        graphics::dx12::TrackAdapters(result, reinterpret_cast<void**>(&factory1.GetInterfacePtr()), adapters_);
+        graphics::dx12::TrackAdapters(result, reinterpret_cast<void**>(&factory1), adapters_);
         render_adapter_ = graphics::dx12::GetAdapterbyIndex(adapters_, options_.override_gpu_index);
+
+        factory1->Release();
     }
 }
 
@@ -3784,7 +3786,7 @@ IDXGIAdapter* Dx12ReplayConsumerBase::GetAdapter()
     {
         for (const auto& adapter : adapters_)
         {
-            if (adapter.second.adapter.GetInterfacePtr() == adapter_found)
+            if (adapter.second.adapter == adapter_found)
             {
                 if (graphics::dx12::IsSoftwareAdapter(adapter.second.internal_desc) == true)
                 {
@@ -3801,7 +3803,7 @@ IDXGIAdapter* Dx12ReplayConsumerBase::GetAdapter()
         {
             if (graphics::dx12::IsSoftwareAdapter(adapter.second.internal_desc) == false)
             {
-                adapter_found = adapter.second.adapter.GetInterfacePtr();
+                adapter_found = adapter.second.adapter;
                 break;
             }
         }
diff --git a/framework/encode/dx12_object_wrapper_info.h b/framework/encode/dx12_object_wrapper_info.h
@@ -384,14 +384,6 @@ struct ID3D12ProtectedResourceSessionInfo : public DxWrapperInfo
 
 struct ID3D12DeviceInfo : public DxWrapperInfo
 {
-    virtual ~ID3D12DeviceInfo()
-    {
-        if (adapter3 != nullptr)
-        {
-            adapter3->Release();
-        }
-    }
-
     // Track the device's parent adapter as IDXGIAdapter3
     // This enables checking GPU memory availability via QueryVideoMemoryInfo()
     IDXGIAdapter3* adapter3{ nullptr };
diff --git a/framework/graphics/dx12_util.cpp b/framework/graphics/dx12_util.cpp
@@ -770,20 +770,18 @@ void TrackAdapters(HRESULT result, void** ppFactory, graphics::dx12::ActiveAdapt
     if (SUCCEEDED(result))
     {
         // First see if the created factory can be queried as a 1.1 factory
-        auto*               base_factory = reinterpret_cast<IUnknown*>(*ppFactory);
-        IDXGIFactory1ComPtr factory1     = nullptr;
+        IDXGIFactory1* factory1 = reinterpret_cast<IDXGIFactory1*>(*ppFactory);
 
         // DXGI 1.1 tracking (default)
-        if (SUCCEEDED(base_factory->QueryInterface(IID_PPV_ARGS(&factory1))))
+        if (SUCCEEDED(factory1->QueryInterface(__uuidof(IDXGIFactory1), reinterpret_cast<void**>(&factory1))))
         {
             // Get a fresh enumeration, in case it was previously filled by 1.0 tracking
             RemoveDeactivatedAdapters(adapters);
 
             // Enumerate 1.1 adapters and fetch data with GetDesc1()
-            IDXGIAdapter1ComPtr adapter1 = nullptr;
+            IDXGIAdapter1* adapter1 = nullptr;
 
-            for (UINT adapter_idx = 0; SUCCEEDED(factory1->EnumAdapters1(adapter_idx, &adapter1.GetInterfacePtr()));
-                 ++adapter_idx)
+            for (UINT adapter_idx = 0; SUCCEEDED(factory1->EnumAdapters1(adapter_idx, &adapter1)); ++adapter_idx)
             {
                 DXGI_ADAPTER_DESC1 dxgi_desc = {};
                 adapter1->GetDesc1(&dxgi_desc);
@@ -794,7 +792,7 @@ void TrackAdapters(HRESULT result, void** ppFactory, graphics::dx12::ActiveAdapt
                     adapter_type = format::AdapterType::kSoftwareAdapter;
                 }
 
-                TrackAdapterDesc(adapter1.GetInterfacePtr(), adapter_idx, dxgi_desc, adapters, adapter_type);
+                TrackAdapterDesc(adapter1, adapter_idx, dxgi_desc, adapters, adapter_type);
             }
         }
 
@@ -804,25 +802,20 @@ void TrackAdapters(HRESULT result, void** ppFactory, graphics::dx12::ActiveAdapt
             // Only enumerate 1.0 factory adapters if nothing has been seen yet
             if (adapters.empty())
             {
-                IDXGIFactoryComPtr factory = nullptr;
+                IDXGIFactory* factory = reinterpret_cast<IDXGIFactory*>(*ppFactory);
 
-                if (SUCCEEDED(base_factory->QueryInterface(IID_PPV_ARGS(&factory))))
+                if (SUCCEEDED(factory->QueryInterface(__uuidof(IDXGIFactory), reinterpret_cast<void**>(&factory))))
                 {
                     // Enumerate 1.0 adapters and fetch data with GetDesc()
-                    IDXGIAdapterComPtr adapter = nullptr;
+                    IDXGIAdapter* adapter = nullptr;
 
-                    for (UINT adapter_idx = 0;
-                         SUCCEEDED(factory->EnumAdapters(adapter_idx, &adapter.GetInterfacePtr()));
-                         ++adapter_idx)
+                    for (UINT adapter_idx = 0; SUCCEEDED(factory->EnumAdapters(adapter_idx, &adapter)); ++adapter_idx)
                     {
                         DXGI_ADAPTER_DESC dxgi_desc = {};
                         adapter->GetDesc(&dxgi_desc);
 
-                        TrackAdapterDesc(adapter.GetInterfacePtr(),
-                                         adapter_idx,
-                                         dxgi_desc,
-                                         adapters,
-                                         format::AdapterType::kUnknownAdapter);
+                        TrackAdapterDesc(
+                            adapter, adapter_idx, dxgi_desc, adapters, format::AdapterType::kUnknownAdapter);
                     }
                 }
                 else
@@ -949,7 +942,7 @@ bool GetAdapterAndIndexbyLUID(LUID                              luid,
     if (search != adapters.end())
     {
         index       = search->second.adapter_idx;
-        adapter_ptr = search->second.adapter.GetInterfacePtr();
+        adapter_ptr = search->second.adapter;
         success     = true;
     }
     return success;
@@ -979,7 +972,7 @@ IDXGIAdapter* GetAdapterbyIndex(graphics::dx12::ActiveAdapterMap& adapters, int3
     {
         if (static_cast<int32_t>(adapter.second.adapter_idx) == index)
         {
-            return adapter.second.adapter.GetInterfacePtr();
+            return adapter.second.adapter;
         }
     }
     return nullptr;
diff --git a/framework/graphics/dx12_util.h b/framework/graphics/dx12_util.h
@@ -57,12 +57,6 @@ GFXRECON_BEGIN_NAMESPACE(dx12)
 
 #ifdef WIN32
 typedef _com_ptr_t<_com_IIID<IDXGISwapChain3, &__uuidof(IDXGISwapChain3)>> IDXGISwapChain3ComPtr;
-typedef _com_ptr_t<_com_IIID<IDXGIAdapter, &__uuidof(IDXGIAdapter)>>       IDXGIAdapterComPtr;
-typedef _com_ptr_t<_com_IIID<IDXGIAdapter1, &__uuidof(IDXGIAdapter1)>>     IDXGIAdapter1ComPtr;
-typedef _com_ptr_t<_com_IIID<IDXGIAdapter2, &__uuidof(IDXGIAdapter2)>>     IDXGIAdapter2ComPtr;
-typedef _com_ptr_t<_com_IIID<IDXGIAdapter3, &__uuidof(IDXGIAdapter3)>>     IDXGIAdapter3ComPtr;
-typedef _com_ptr_t<_com_IIID<IDXGIFactory, &__uuidof(IDXGIFactory)>>       IDXGIFactoryComPtr;
-typedef _com_ptr_t<_com_IIID<IDXGIFactory1, &__uuidof(IDXGIFactory1)>>     IDXGIFactory1ComPtr;
 
 typedef _com_ptr_t<_com_IIID<ID3D12DescriptorHeap, &__uuidof(ID3D12DescriptorHeap)>>     ID3D12DescriptorHeapComPtr;
 typedef _com_ptr_t<_com_IIID<ID3D12Device, &__uuidof(ID3D12Device)>>                     ID3D12DeviceComPtr;
@@ -141,7 +135,7 @@ uint32_t Dx12DumpResourcePosToArrayIndex(Dx12DumpResourcePos pos);
 struct ActiveAdapterInfo
 {
     format::DxgiAdapterDesc internal_desc;
-    IDXGIAdapterComPtr      adapter;
+    IDXGIAdapter*           adapter;
     UINT32                  adapter_idx;
     bool                    active;
 };
diff --git a/tools/info/main.cpp b/tools/info/main.cpp
@@ -1102,15 +1102,14 @@ static bool CheckOptionEnumGpuIndices(const char* exe_name, const gfxrecon::util
 {
     if (arg_parser.IsOptionSet(kEnumGpuIndices))
     {
-        gfxrecon::graphics::dx12::IDXGIFactory1ComPtr factory1 = nullptr;
+        IDXGIFactory1* factory1 = nullptr;
 
-        HRESULT result = CreateDXGIFactory1(IID_PPV_ARGS(&factory1));
+        HRESULT result = CreateDXGIFactory1(IID_IDXGIFactory1, reinterpret_cast<void**>(&factory1));
 
         if (SUCCEEDED(result))
         {
             gfxrecon::graphics::dx12::ActiveAdapterMap adapters{};
-            gfxrecon::graphics::dx12::TrackAdapters(
-                result, reinterpret_cast<void**>(&factory1.GetInterfacePtr()), adapters);
+            gfxrecon::graphics::dx12::TrackAdapters(result, reinterpret_cast<void**>(&factory1), adapters);
 
             WriteOutput("GPU index\tGPU name\tSubSys ID");
             for (size_t index = 0; index < adapters.size(); ++index)
@@ -1126,10 +1125,12 @@ static bool CheckOptionEnumGpuIndices(const char* exe_name, const gfxrecon::util
                                     adapter.second.adapter_idx,
                                     replay_adapter_str.c_str(),
                                     adapter.second.internal_desc.SubSysId);
+                        adapter.second.adapter->Release();
                         break;
                     }
                 }
             }
+            factory1->Release();
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -1537,14 +1537,16 @@ void Dx12ReplayConsumerBase::InitializeD3D12Device(HandlePointerDecoder<void>`
`1537`	`1537`
`1538`	`1538`	`void Dx12ReplayConsumerBase::DetectAdapters()`
`1539`	`1539`	`{`
`1540`		`- graphics::dx12::IDXGIFactory1ComPtr factory1 = nullptr;`
	`1540`	`+ IDXGIFactory1* factory1 = nullptr;`
`1541`	`1541`
`1542`		`- HRESULT result = CreateDXGIFactory1(IID_PPV_ARGS(&factory1));`
	`1542`	`+ HRESULT result = CreateDXGIFactory1(IID_IDXGIFactory1, reinterpret_cast<void**>(&factory1));`
`1543`	`1543`
`1544`	`1544`	`if (SUCCEEDED(result))`
`1545`	`1545`	`{`
`1546`		`- graphics::dx12::TrackAdapters(result, reinterpret_cast<void**>(&factory1.GetInterfacePtr()), adapters_);`
	`1546`	`+ graphics::dx12::TrackAdapters(result, reinterpret_cast<void**>(&factory1), adapters_);`
`1547`	`1547`	`render_adapter_ = graphics::dx12::GetAdapterbyIndex(adapters_, options_.override_gpu_index);`
	`1548`	`+`
	`1549`	`+ factory1->Release();`
`1548`	`1550`	`}`
`1549`	`1551`	`}`
`1550`	`1552`
`@@ -3784,7 +3786,7 @@ IDXGIAdapter* Dx12ReplayConsumerBase::GetAdapter()`
`3784`	`3786`	`{`
`3785`	`3787`	`for (const auto& adapter : adapters_)`
`3786`	`3788`	`{`
`3787`		`- if (adapter.second.adapter.GetInterfacePtr() == adapter_found)`
	`3789`	`+ if (adapter.second.adapter == adapter_found)`
`3788`	`3790`	`{`
`3789`	`3791`	`if (graphics::dx12::IsSoftwareAdapter(adapter.second.internal_desc) == true)`
`3790`	`3792`	`{`
`@@ -3801,7 +3803,7 @@ IDXGIAdapter* Dx12ReplayConsumerBase::GetAdapter()`
`3801`	`3803`	`{`
`3802`	`3804`	`if (graphics::dx12::IsSoftwareAdapter(adapter.second.internal_desc) == false)`
`3803`	`3805`	`{`
`3804`		`- adapter_found = adapter.second.adapter.GetInterfacePtr();`
	`3806`	`+ adapter_found = adapter.second.adapter;`
`3805`	`3807`	`break;`
`3806`	`3808`	`}`
`3807`	`3809`	`}`
Original file line number	Diff line number	Diff line change
`@@ -770,20 +770,18 @@ void TrackAdapters(HRESULT result, void** ppFactory, graphics::dx12::ActiveAdapt`
`770`	`770`	`if (SUCCEEDED(result))`
`771`	`771`	`{`
`772`	`772`	`// First see if the created factory can be queried as a 1.1 factory`
`773`		`- auto* base_factory = reinterpret_cast<IUnknown>(ppFactory);`
`774`		`- IDXGIFactory1ComPtr factory1 = nullptr;`
	`773`	`+ IDXGIFactory1* factory1 = reinterpret_cast<IDXGIFactory1>(ppFactory);`
`775`	`774`
`776`	`775`	`// DXGI 1.1 tracking (default)`
`777`		`- if (SUCCEEDED(base_factory->QueryInterface(IID_PPV_ARGS(&factory1))))`
	`776`	`+ if (SUCCEEDED(factory1->QueryInterface(__uuidof(IDXGIFactory1), reinterpret_cast<void**>(&factory1))))`
`778`	`777`	`{`
`779`	`778`	`// Get a fresh enumeration, in case it was previously filled by 1.0 tracking`
`780`	`779`	`RemoveDeactivatedAdapters(adapters);`
`781`	`780`
`782`	`781`	`// Enumerate 1.1 adapters and fetch data with GetDesc1()`
`783`		`- IDXGIAdapter1ComPtr adapter1 = nullptr;`
	`782`	`+ IDXGIAdapter1* adapter1 = nullptr;`
`784`	`783`
`785`		`- for (UINT adapter_idx = 0; SUCCEEDED(factory1->EnumAdapters1(adapter_idx, &adapter1.GetInterfacePtr()));`
`786`		`- ++adapter_idx)`
	`784`	`+ for (UINT adapter_idx = 0; SUCCEEDED(factory1->EnumAdapters1(adapter_idx, &adapter1)); ++adapter_idx)`
`787`	`785`	`{`
`788`	`786`	`DXGI_ADAPTER_DESC1 dxgi_desc = {};`
`789`	`787`	`adapter1->GetDesc1(&dxgi_desc);`
`@@ -794,7 +792,7 @@ void TrackAdapters(HRESULT result, void** ppFactory, graphics::dx12::ActiveAdapt`
`794`	`792`	`adapter_type = format::AdapterType::kSoftwareAdapter;`
`795`	`793`	`}`
`796`	`794`
`797`		`- TrackAdapterDesc(adapter1.GetInterfacePtr(), adapter_idx, dxgi_desc, adapters, adapter_type);`
	`795`	`+ TrackAdapterDesc(adapter1, adapter_idx, dxgi_desc, adapters, adapter_type);`
`798`	`796`	`}`
`799`	`797`	`}`
`800`	`798`
`@@ -804,25 +802,20 @@ void TrackAdapters(HRESULT result, void** ppFactory, graphics::dx12::ActiveAdapt`
`804`	`802`	`// Only enumerate 1.0 factory adapters if nothing has been seen yet`
`805`	`803`	`if (adapters.empty())`
`806`	`804`	`{`
`807`		`- IDXGIFactoryComPtr factory = nullptr;`
	`805`	`+ IDXGIFactory* factory = reinterpret_cast<IDXGIFactory>(ppFactory);`
`808`	`806`
`809`		`- if (SUCCEEDED(base_factory->QueryInterface(IID_PPV_ARGS(&factory))))`
	`807`	`+ if (SUCCEEDED(factory->QueryInterface(__uuidof(IDXGIFactory), reinterpret_cast<void**>(&factory))))`
`810`	`808`	`{`
`811`	`809`	`// Enumerate 1.0 adapters and fetch data with GetDesc()`
`812`		`- IDXGIAdapterComPtr adapter = nullptr;`
	`810`	`+ IDXGIAdapter* adapter = nullptr;`
`813`	`811`
`814`		`- for (UINT adapter_idx = 0;`
`815`		`- SUCCEEDED(factory->EnumAdapters(adapter_idx, &adapter.GetInterfacePtr()));`
`816`		`- ++adapter_idx)`
	`812`	`+ for (UINT adapter_idx = 0; SUCCEEDED(factory->EnumAdapters(adapter_idx, &adapter)); ++adapter_idx)`
`817`	`813`	`{`
`818`	`814`	`DXGI_ADAPTER_DESC dxgi_desc = {};`
`819`	`815`	`adapter->GetDesc(&dxgi_desc);`
`820`	`816`
`821`		`- TrackAdapterDesc(adapter.GetInterfacePtr(),`
`822`		`- adapter_idx,`
`823`		`- dxgi_desc,`
`824`		`- adapters,`
`825`		`- format::AdapterType::kUnknownAdapter);`
	`817`	`+ TrackAdapterDesc(`
	`818`	`+ adapter, adapter_idx, dxgi_desc, adapters, format::AdapterType::kUnknownAdapter);`
`826`	`819`	`}`
`827`	`820`	`}`
`828`	`821`	`else`
`@@ -949,7 +942,7 @@ bool GetAdapterAndIndexbyLUID(LUID luid,`
`949`	`942`	`if (search != adapters.end())`
`950`	`943`	`{`
`951`	`944`	`index = search->second.adapter_idx;`
`952`		`- adapter_ptr = search->second.adapter.GetInterfacePtr();`
	`945`	`+ adapter_ptr = search->second.adapter;`
`953`	`946`	`success = true;`
`954`	`947`	`}`
`955`	`948`	`return success;`
`@@ -979,7 +972,7 @@ IDXGIAdapter* GetAdapterbyIndex(graphics::dx12::ActiveAdapterMap& adapters, int3`
`979`	`972`	`{`
`980`	`973`	`if (static_cast<int32_t>(adapter.second.adapter_idx) == index)`
`981`	`974`	`{`
`982`		`- return adapter.second.adapter.GetInterfacePtr();`
	`975`	`+ return adapter.second.adapter;`
`983`	`976`	`}`
`984`	`977`	`}`
`985`	`978`	`return nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -1102,15 +1102,14 @@ static bool CheckOptionEnumGpuIndices(const char* exe_name, const gfxrecon::util`
`1102`	`1102`	`{`
`1103`	`1103`	`if (arg_parser.IsOptionSet(kEnumGpuIndices))`
`1104`	`1104`	`{`
`1105`		`- gfxrecon::graphics::dx12::IDXGIFactory1ComPtr factory1 = nullptr;`
	`1105`	`+ IDXGIFactory1* factory1 = nullptr;`
`1106`	`1106`
`1107`		`- HRESULT result = CreateDXGIFactory1(IID_PPV_ARGS(&factory1));`
	`1107`	`+ HRESULT result = CreateDXGIFactory1(IID_IDXGIFactory1, reinterpret_cast<void**>(&factory1));`
`1108`	`1108`
`1109`	`1109`	`if (SUCCEEDED(result))`
`1110`	`1110`	`{`
`1111`	`1111`	`gfxrecon::graphics::dx12::ActiveAdapterMap adapters{};`
`1112`		`- gfxrecon::graphics::dx12::TrackAdapters(`
`1113`		`- result, reinterpret_cast<void**>(&factory1.GetInterfacePtr()), adapters);`
	`1112`	`+ gfxrecon::graphics::dx12::TrackAdapters(result, reinterpret_cast<void**>(&factory1), adapters);`
`1114`	`1113`
`1115`	`1114`	`WriteOutput("GPU index\tGPU name\tSubSys ID");`
`1116`	`1115`	`for (size_t index = 0; index < adapters.size(); ++index)`
`@@ -1126,10 +1125,12 @@ static bool CheckOptionEnumGpuIndices(const char* exe_name, const gfxrecon::util`
`1126`	`1125`	`adapter.second.adapter_idx,`
`1127`	`1126`	`replay_adapter_str.c_str(),`
`1128`	`1127`	`adapter.second.internal_desc.SubSysId);`
	`1128`	`+ adapter.second.adapter->Release();`
`1129`	`1129`	`break;`
`1130`	`1130`	`}`
`1131`	`1131`	`}`
`1132`	`1132`	`}`
	`1133`	`+ factory1->Release();`
`1133`	`1134`	`}`
`1134`	`1135`	`else`
`1135`	`1136`	`{`