archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 23:11:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

d3d12: Use copy queue to transfer z buffer

Browse source
This commit is contained in:
vlj 2015-05-27 00:27:15 +02:00 • committed by Vincent Lejeune
parent f618247937
commit 7a431e85f6
2 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

62
rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
View file

@ -25,6 +25,7 @@ void D3D12GSRender::ResourceStorage::Reset()
m_commandAllocator->Reset(); m_commandAllocator->Reset();
m_textureUploadCommandAllocator->Reset(); m_textureUploadCommandAllocator->Reset();
m_downloadCommandAllocator->Reset();
for (ID3D12GraphicsCommandList *gfxCommandList : m_inflightCommandList) for (ID3D12GraphicsCommandList *gfxCommandList : m_inflightCommandList)
gfxCommandList->Release(); gfxCommandList->Release();
m_inflightCommandList.clear(); m_inflightCommandList.clear();
@ -39,6 +40,7 @@ void D3D12GSRender::ResourceStorage::Init(ID3D12Device *device)
// Create a global command allocator // Create a global command allocator
device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(&m_commandAllocator)); device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(&m_commandAllocator));
device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(&m_textureUploadCommandAllocator)); device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(&m_textureUploadCommandAllocator));
check(device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_COPY, IID_PPV_ARGS(&m_downloadCommandAllocator)));
// Create heap for vertex and constants buffers // Create heap for vertex and constants buffers
D3D12_HEAP_DESC vertexBufferHeapDesc = {}; D3D12_HEAP_DESC vertexBufferHeapDesc = {};
@ -102,6 +104,7 @@ void D3D12GSRender::ResourceStorage::Release()
tmp->Release(); tmp->Release();
m_commandAllocator->Release(); m_commandAllocator->Release();
m_textureUploadCommandAllocator->Release(); m_textureUploadCommandAllocator->Release();
m_downloadCommandAllocator->Release();
} }
// 32 bits float to U8 unorm CS // 32 bits float to U8 unorm CS
@ -1102,8 +1105,16 @@ void D3D12GSRender::semaphorePGRAPHBackendRelease(u32 offset, u32 value)
/* if (!Ini.GSDumpDepthBuffer.GetValue()) /* if (!Ini.GSDumpDepthBuffer.GetValue())
return;*/ return;*/
ID3D12Fence *fence;
check(
m_device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&fence))
);
HANDLE handle = CreateEvent(0, FALSE, FALSE, 0);
fence->SetEventOnCompletion(1, handle);
ID3D12Resource *writeDest, *depthConverted; ID3D12Resource *writeDest, *depthConverted;
ID3D12GraphicsCommandList *downloadCommandList; ID3D12GraphicsCommandList *convertCommandList, *downloadCommandList;
ID3D12DescriptorHeap *descriptorHeap; ID3D12DescriptorHeap *descriptorHeap;
size_t rowPitch = RSXThread::m_width; size_t rowPitch = RSXThread::m_width;
rowPitch = (rowPitch + 255) & ~255; rowPitch = (rowPitch + 255) & ~255;
@ -1155,7 +1166,7 @@ void D3D12GSRender::semaphorePGRAPHBackendRelease(u32 offset, u32 value)
); );
check( check(
m_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, getCurrentResourceStorage().m_commandAllocator, nullptr, IID_PPV_ARGS(&downloadCommandList)) m_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, getCurrentResourceStorage().m_commandAllocator, nullptr, IID_PPV_ARGS(&convertCommandList))
); );
D3D12_DESCRIPTOR_HEAP_DESC descriptorHeapDesc = {}; D3D12_DESCRIPTOR_HEAP_DESC descriptorHeapDesc = {};
@ -1198,13 +1209,13 @@ void D3D12GSRender::semaphorePGRAPHBackendRelease(u32 offset, u32 value)
barrier.Transition.pResource = m_fbo->getDepthStencilTexture(); barrier.Transition.pResource = m_fbo->getDepthStencilTexture();
barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_DEPTH_WRITE; barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_DEPTH_WRITE;
barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_GENERIC_READ; barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_GENERIC_READ;
downloadCommandList->ResourceBarrier(1, &barrier); convertCommandList->ResourceBarrier(1, &barrier);
downloadCommandList->SetPipelineState(m_convertPSO); convertCommandList->SetPipelineState(m_convertPSO);
downloadCommandList->SetComputeRootSignature(m_convertRootSignature); convertCommandList->SetComputeRootSignature(m_convertRootSignature);
downloadCommandList->SetDescriptorHeaps(1, &descriptorHeap); convertCommandList->SetDescriptorHeaps(1, &descriptorHeap);
downloadCommandList->SetComputeRootDescriptorTable(0, descriptorHeap->GetGPUDescriptorHandleForHeapStart()); convertCommandList->SetComputeRootDescriptorTable(0, descriptorHeap->GetGPUDescriptorHandleForHeapStart());
downloadCommandList->Dispatch(RSXThread::m_width / 8, RSXThread::m_height / 8, 1); convertCommandList->Dispatch(RSXThread::m_width / 8, RSXThread::m_height / 8, 1);
barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_GENERIC_READ; barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_GENERIC_READ;
barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_DEPTH_WRITE; barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_DEPTH_WRITE;
@ -1218,14 +1229,27 @@ void D3D12GSRender::semaphorePGRAPHBackendRelease(u32 offset, u32 value)
barrier, barrier,
uavbarrier, uavbarrier,
}; };
downloadCommandList->ResourceBarrier(2, barriers); convertCommandList->ResourceBarrier(2, barriers);
// Copy
barrier.Transition.pResource = depthConverted; barrier.Transition.pResource = depthConverted;
barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_UNORDERED_ACCESS; barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_SOURCE; barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_SOURCE;
downloadCommandList->ResourceBarrier(1, &barrier); convertCommandList->ResourceBarrier(1, &barrier);
convertCommandList->Close();
m_commandQueueGraphic->ExecuteCommandLists(1, (ID3D12CommandList**)&convertCommandList);
ID3D12Fence *convertDownloadFence;
check(
m_device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&convertDownloadFence))
);
m_commandQueueGraphic->Signal(convertDownloadFence, 1);
check(
m_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_COPY, getCurrentResourceStorage().m_downloadCommandAllocator, nullptr, IID_PPV_ARGS(&downloadCommandList))
);
// Copy
D3D12_TEXTURE_COPY_LOCATION dst = {}, src = {}; D3D12_TEXTURE_COPY_LOCATION dst = {}, src = {};
src.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; src.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
src.pResource = depthConverted; src.pResource = depthConverted;
@ -1240,16 +1264,13 @@ void D3D12GSRender::semaphorePGRAPHBackendRelease(u32 offset, u32 value)
downloadCommandList->CopyTextureRegion(&dst, 0, 0, 0, &src, nullptr); downloadCommandList->CopyTextureRegion(&dst, 0, 0, 0, &src, nullptr);
downloadCommandList->Close(); downloadCommandList->Close();
m_commandQueueGraphic->ExecuteCommandLists(1, (ID3D12CommandList**)&downloadCommandList); m_commandQueueCopy->Wait(convertDownloadFence, 1);
} m_commandQueueCopy->ExecuteCommandLists(1, (ID3D12CommandList**)&downloadCommandList);
//Wait for result //Wait for result
ID3D12Fence *fence; m_commandQueueCopy->Signal(fence, 1);
check( convertDownloadFence->Release();
m_device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&fence)) }
); else
HANDLE handle = CreateEvent(0, FALSE, FALSE, 0);
fence->SetEventOnCompletion(1, handle);
m_commandQueueGraphic->Signal(fence, 1); m_commandQueueGraphic->Signal(fence, 1);
std::thread valueChangerThread([=]() { std::thread valueChangerThread([=]() {
@ -1281,6 +1302,7 @@ void D3D12GSRender::semaphorePGRAPHBackendRelease(u32 offset, u32 value)
descriptorHeap->Release(); descriptorHeap->Release();
fence->Release(); fence->Release();
downloadCommandList->Release(); downloadCommandList->Release();
convertCommandList->Release();
} }
vm::write32(m_label_addr + offset, value); vm::write32(m_label_addr + offset, value);

1
rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
View file

@ -60,6 +60,7 @@ private:
struct ResourceStorage struct ResourceStorage
{ {
ID3D12CommandAllocator *m_commandAllocator; ID3D12CommandAllocator *m_commandAllocator;
ID3D12CommandAllocator *m_downloadCommandAllocator;
std::list<ID3D12GraphicsCommandList *> m_inflightCommandList; std::list<ID3D12GraphicsCommandList *> m_inflightCommandList;
std::vector<ID3D12Resource *> m_inflightResources; std::vector<ID3D12Resource *> m_inflightResources;