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

Use placed resources and batched heaps for D3D12 initial contents

Browse Source
This commit is contained in:
baldurk
2023-05-02 15:06:39 +01:00
parent d891a31c90
commit 1a9f49776a
3 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_device.cpp
+53
View File
@@ -1295,6 +1295,51 @@ HRESULT WrappedID3D12Device::QueryInterface(REFIID riid, void **ppvObject)
return m_RefCounter.QueryInterface("ID3D12Device", riid, ppvObject);
}
HRESULT WrappedID3D12Device::CreateInitialStateBuffer(const D3D12_RESOURCE_DESC &desc,
ID3D12Resource **buf)
{
const UINT64 InitialStateHeapSize = 128 * 1024 * 1024;
HRESULT ret = S_OK;
if(m_InitialStateHeaps.empty() || m_LastInitialStateHeapOffset >= InitialStateHeapSize ||
desc.Width > InitialStateHeapSize - m_LastInitialStateHeapOffset)
{
D3D12_HEAP_DESC heapDesc = {};
heapDesc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
heapDesc.SizeInBytes = InitialStateHeapSize;
heapDesc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
heapDesc.Properties.Type = D3D12_HEAP_TYPE_READBACK;
heapDesc.Properties.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
heapDesc.Properties.MemoryPoolPreference = D3D12_MEMORY_POOL_UNKNOWN;
heapDesc.Properties.CreationNodeMask = 1;
heapDesc.Properties.VisibleNodeMask = 1;
ID3D12Heap *heap = NULL;
ret = GetReal()->CreateHeap(&heapDesc, __uuidof(ID3D12Heap), (void **)&heap);
if(FAILED(ret))
{
SAFE_RELEASE(heap);
return ret;
}
m_InitialStateHeaps.push_back(heap);
m_LastInitialStateHeapOffset = 0;
}
ret = GetReal()->CreatePlacedResource(m_InitialStateHeaps.back(), m_LastInitialStateHeapOffset,
&desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL,
__uuidof(ID3D12Resource), (void **)buf);
// all D3D12 buffers are 64kb aligned
m_LastInitialStateHeapOffset = AlignUp(m_LastInitialStateHeapOffset + desc.Width, 64 * 1024LLU);
return ret;
}
ID3D12Resource *WrappedID3D12Device::GetUploadBuffer(uint64_t chunkOffset, uint64_t byteSize)
{
ID3D12Resource *buf = m_UploadBuffers[chunkOffset];
@@ -2805,6 +2850,10 @@ bool WrappedID3D12Device::EndFrameCapture(DeviceOwnedWindow devWnd)
for(ID3D12Resource *r : m_RefBuffers)
r->Release();
for(ID3D12Heap *h : m_InitialStateHeaps)
h->Release();
m_InitialStateHeaps.clear();
WrappedID3D12CommandAllocator::ResumeResets();
GetResourceManager()->MarkUnwrittenResources();
@@ -2857,6 +2906,10 @@ bool WrappedID3D12Device::DiscardFrameCapture(DeviceOwnedWindow devWnd)
for(ID3D12Resource *r : m_RefBuffers)
r->Release();
for(ID3D12Heap *h : m_InitialStateHeaps)
h->Release();
m_InitialStateHeaps.clear();
WrappedID3D12CommandAllocator::ResumeResets();
GetResourceManager()->MarkUnwrittenResources();
renderdoc/driver/d3d12/d3d12_device.h
+5
View File
@@ -934,6 +934,11 @@ public:
bool IsReadOnlyResource(ResourceId id) { return m_ModResources.find(id) == m_ModResources.end(); }
void CloseInitialStateList();
ID3D12Resource *GetUploadBuffer(uint64_t chunkOffset, uint64_t byteSize);
HRESULT CreateInitialStateBuffer(const D3D12_RESOURCE_DESC &desc, ID3D12Resource **buf);
rdcarray<ID3D12Heap *> m_InitialStateHeaps;
UINT64 m_LastInitialStateHeapOffset = 0;
void ApplyInitialContents();
void AddCaptureSubmission();
renderdoc/driver/d3d12/d3d12_initstate.cpp
+2 -19
View File
@@ -105,18 +105,10 @@ bool D3D12ResourceManager::Prepare_InitialState(ID3D12DeviceChild *res)
const bool isUploadHeap = (heapProps.Type == D3D12_HEAP_TYPE_UPLOAD);
heapProps.Type = D3D12_HEAP_TYPE_READBACK;
heapProps.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
heapProps.MemoryPoolPreference = D3D12_MEMORY_POOL_UNKNOWN;
heapProps.CreationNodeMask = 1;
heapProps.VisibleNodeMask = 1;
desc.Flags = D3D12_RESOURCE_FLAG_NONE;
ID3D12Resource *copyDst = NULL;
hr = m_Device->GetReal()->CreateCommittedResource(&heapProps, D3D12_HEAP_FLAG_NONE, &desc,
D3D12_RESOURCE_STATE_COPY_DEST, NULL,
__uuidof(ID3D12Resource), (void **)&copyDst);
hr = m_Device->CreateInitialStateBuffer(desc, &copyDst);
if(nonresident)
m_Device->GetReal()->MakeResident(1, &unwrappedPageable);
@@ -277,13 +269,6 @@ bool D3D12ResourceManager::Prepare_InitialState(ID3D12DeviceChild *res)
unwrappedCopySource = arrayTexture;
}
D3D12_HEAP_PROPERTIES heapProps;
heapProps.Type = D3D12_HEAP_TYPE_READBACK;
heapProps.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
heapProps.MemoryPoolPreference = D3D12_MEMORY_POOL_UNKNOWN;
heapProps.CreationNodeMask = 1;
heapProps.VisibleNodeMask = 1;
D3D12_RESOURCE_DESC bufDesc;
bufDesc.Alignment = 0;
@@ -337,9 +322,7 @@ bool D3D12ResourceManager::Prepare_InitialState(ID3D12DeviceChild *res)
bufDesc.Width = 1U;
ID3D12Resource *copyDst = NULL;
HRESULT hr = m_Device->GetReal()->CreateCommittedResource(
&heapProps, D3D12_HEAP_FLAG_NONE, &bufDesc, D3D12_RESOURCE_STATE_COPY_DEST, NULL,
__uuidof(ID3D12Resource), (void **)&copyDst);
HRESULT hr = m_Device->CreateInitialStateBuffer(bufDesc, &copyDst);
if(SUCCEEDED(hr))
{