lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 17:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fake backbuffer refcount on D3D12 to match D3D11 behaviour. Refs #527

Browse Source
This commit is contained in:
baldurk
2017-02-24 14:23:31 +00:00
parent eb5ae4a1bf
commit 4dec05cb2b
3 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_device.cpp
+18 -1
View File
@@ -648,7 +648,13 @@ void WrappedID3D12Device::ReleaseSwapchainResources(WrappedIDXGISwapChain4 *swap
for(int i = 0; i < swap->GetNumBackbuffers(); i++)
{
WrappedID3D12Resource *wrapped = (WrappedID3D12Resource *)swap->GetBackbuffers()[i];
ID3D12Resource *res = (ID3D12Resource *)swap->GetBackbuffers()[i];
if(!res)
continue;
WrappedID3D12Resource *wrapped = (WrappedID3D12Resource *)res;
wrapped->ReleaseInternalRef();
SAFE_RELEASE(wrapped);
}
@@ -671,6 +677,17 @@ void WrappedID3D12Device::ReleaseSwapchainResources(WrappedIDXGISwapChain4 *swap
}
}
void WrappedID3D12Device::NewSwapchainBuffer(IUnknown *backbuffer)
{
ID3D12Resource *pRes = (ID3D12Resource *)backbuffer;
if(pRes)
{
WrappedID3D12Resource *wrapped = (WrappedID3D12Resource *)pRes;
wrapped->AddInternalRef();
}
}
bool WrappedID3D12Device::Serialise_WrapSwapchainBuffer(Serialiser *localSerialiser,
WrappedIDXGISwapChain4 *swap,
DXGI_SWAP_CHAIN_DESC *swapDesc, UINT buffer,
renderdoc/driver/d3d12/d3d12_device.h
+1 -1
View File
@@ -472,7 +472,7 @@ public:
UINT buffer, IUnknown *realSurface);
HRESULT Present(WrappedIDXGISwapChain4 *swap, UINT SyncInterval, UINT Flags);
void NewSwapchainBuffer(IUnknown *backbuffer) {}
void NewSwapchainBuffer(IUnknown *backbuffer);
void ReleaseSwapchainResources(WrappedIDXGISwapChain4 *swap, UINT QueueCount,
IUnknown *const *ppPresentQueue, IUnknown **unwrappedQueues);
renderdoc/driver/d3d12/d3d12_resources.h
+28 -3
View File
@@ -56,10 +56,13 @@ class WrappedDeviceChild12 : public RefCounter12<NestedType>,
{
protected:
WrappedID3D12Device *m_pDevice;
ULONG m_InternalRefcount;
WrappedDeviceChild12(NestedType *real, WrappedID3D12Device *device)
: RefCounter12(real), m_pDevice(device)
{
m_InternalRefcount = 0;
m_pDevice->SoftRef();
if(real)
@@ -93,9 +96,31 @@ protected:
public:
typedef NestedType InnerType;
// some applications wrongly check refcount return values and expect them to
// match D3D's values. When we have some internal refs we need to hide, we
// add them here and they're subtracted from return values
void AddInternalRef() { InterlockedIncrement(&m_InternalRefcount); }
void ReleaseInternalRef() { InterlockedDecrement(&m_InternalRefcount); }
NestedType *GetReal() { return m_pReal; }
ULONG STDMETHODCALLTYPE AddRef() { return RefCounter12::SoftRef(m_pDevice); }
ULONG STDMETHODCALLTYPE Release() { return RefCounter12::SoftRelease(m_pDevice); }
ULONG STDMETHODCALLTYPE AddRef()
{
ULONG ret = RefCounter12::SoftRef(m_pDevice);
if(ret >= m_InternalRefcount)
ret -= m_InternalRefcount;
return ret;
}
ULONG STDMETHODCALLTYPE Release()
{
ULONG ret = RefCounter12::SoftRelease(m_pDevice);
if(ret >= m_InternalRefcount)
ret -= m_InternalRefcount;
return ret;
}
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject)
{
if(riid == __uuidof(IUnknown))
@@ -722,7 +747,7 @@ class WrappedID3D12Resource : public WrappedDeviceChild12<ID3D12Resource>
public:
static const int AllocPoolCount = 16384;
static const int AllocMaxByteSize = 1024 * 1024;
static const int AllocMaxByteSize = 1536 * 1024;
ALLOCATE_WITH_WRAPPED_POOL(WrappedID3D12Resource, AllocPoolCount, AllocMaxByteSize, false);
static std::map<ResourceId, WrappedID3D12Resource *> *m_List;