From a2b629415e0bdeaa981686134e5f58e3d893a4ee Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 27 Oct 2019 11:10:49 +0100 Subject: [PATCH] Revert "[d3d11] Fix ref counting for D3D11CommandList" This reverts commit 55bae45915ffe6066fcaba76941a473684d471a4. --- src/d3d11/d3d11_cmdlist.cpp | 16 ---------------- src/d3d11/d3d11_cmdlist.h | 8 +------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/d3d11/d3d11_cmdlist.cpp b/src/d3d11/d3d11_cmdlist.cpp index 25205e73c..cd8939a5b 100644 --- a/src/d3d11/d3d11_cmdlist.cpp +++ b/src/d3d11/d3d11_cmdlist.cpp @@ -15,22 +15,6 @@ namespace dxvk { } - ULONG STDMETHODCALLTYPE D3D11CommandList::AddRef() { - ULONG refCount = m_refCount++; - if (!refCount) - m_device->AddRef(); - return refCount + 1; - } - - - ULONG STDMETHODCALLTYPE D3D11CommandList::Release() { - ULONG refCount = --m_refCount; - if (!refCount) - m_device->Release(); - return refCount; - } - - HRESULT STDMETHODCALLTYPE D3D11CommandList::QueryInterface(REFIID riid, void** ppvObject) { if (ppvObject == nullptr) return E_POINTER; diff --git a/src/d3d11/d3d11_cmdlist.h b/src/d3d11/d3d11_cmdlist.h index 58d16fe6c..d8437fee3 100644 --- a/src/d3d11/d3d11_cmdlist.h +++ b/src/d3d11/d3d11_cmdlist.h @@ -4,7 +4,7 @@ namespace dxvk { - class D3D11CommandList : public D3D11DeviceChild { + class D3D11CommandList : public D3D11DeviceChild { public: @@ -14,10 +14,6 @@ namespace dxvk { ~D3D11CommandList(); - ULONG STDMETHODCALLTYPE AddRef(); - - ULONG STDMETHODCALLTYPE Release(); - HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, void** ppvObject) final; @@ -46,8 +42,6 @@ namespace dxvk { std::atomic m_submitted = { false }; std::atomic m_warned = { false }; - std::atomic m_refCount = { 0u }; - void MarkSubmitted(); };