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

Fix crashes if exporting structured data with open D3D12 capture

Browse Source
This commit is contained in:
baldurk
2018-02-16 12:37:44 +00:00
parent 81b9a94bbe
commit f3f688fd48
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_device.cpp
+6 -4
View File
@@ -143,8 +143,6 @@ WrappedID3D12Device::WrappedID3D12Device(ID3D12Device *realDevice, D3D12InitPara
m_pDevice->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS, &m_D3D12Opts, sizeof(m_D3D12Opts));
}
WrappedID3D12Resource::m_List = NULL;
// refcounters implicitly construct with one reference, but we don't start with any soft
// references.
m_SoftRefCounter.Release();
@@ -179,7 +177,8 @@ WrappedID3D12Device::WrappedID3D12Device(ID3D12Device *realDevice, D3D12InitPara
{
m_State = CaptureState::LoadingReplaying;
WrappedID3D12Resource::m_List = new std::map<ResourceId, WrappedID3D12Resource *>();
if(realDevice)
WrappedID3D12Resource::m_List = new std::map<ResourceId, WrappedID3D12Resource *>();
m_FrameCaptureRecord = NULL;
@@ -188,6 +187,8 @@ WrappedID3D12Device::WrappedID3D12Device(ID3D12Device *realDevice, D3D12InitPara
else
{
m_State = CaptureState::BackgroundCapturing;
WrappedID3D12Resource::m_List = NULL;
}
m_ResourceManager = new D3D12ResourceManager(m_State, this);
@@ -292,7 +293,8 @@ WrappedID3D12Device::~WrappedID3D12Device()
{
RenderDoc::Inst().RemoveDeviceFrameCapturer((ID3D12Device *)this);
SAFE_DELETE(WrappedID3D12Resource::m_List);
if(!IsStructuredExporting(m_State))
SAFE_DELETE(WrappedID3D12Resource::m_List);
for(size_t i = 0; i < m_QueueFences.size(); i++)
{