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

d3d12: make depth read optionnal

Browse source
This commit is contained in:
vlj 2015-05-24 01:49:20 +02:00 • committed by Vincent Lejeune
parent 487fd4dc2a
commit 824b9aa628
1 changed files with 82 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1419,100 +1419,101 @@ void D3D12GSRender::Flip()
void D3D12GSRender::WriteDepthBuffer() void D3D12GSRender::WriteDepthBuffer()
{ {
if (!m_set_context_dma_z) if (!Ini.GSDumpDepthBuffer.GetValue())
return; return;
if (!m_set_context_dma_z)
return;
u32 address = GetAddress(m_surface_offset_z, m_context_dma_z - 0xfeed0000); u32 address = GetAddress(m_surface_offset_z, m_context_dma_z - 0xfeed0000);
auto ptr = vm::get_ptr<void>(address);
auto ptr = vm::get_ptr<void>(address); D3D12_HEAP_PROPERTIES heapProp = {};
heapProp.Type = D3D12_HEAP_TYPE_READBACK;
D3D12_RESOURCE_DESC resdesc = {};
resdesc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
resdesc.Width = RSXThread::m_width * RSXThread::m_height * 4 * 2; // * 2 for safety
resdesc.Height = 1;
resdesc.DepthOrArraySize = 1;
resdesc.SampleDesc.Count = 1;
resdesc.MipLevels = 1;
resdesc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
D3D12_HEAP_PROPERTIES heapProp = {}; ID3D12Resource *writeDest;
heapProp.Type = D3D12_HEAP_TYPE_READBACK; check(
D3D12_RESOURCE_DESC resdesc = {}; m_device->CreateCommittedResource(
resdesc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; &heapProp,
resdesc.Width = RSXThread::m_width * RSXThread::m_height * 4 * 2; // * 2 for safety D3D12_HEAP_FLAG_NONE,
resdesc.Height = 1; &resdesc,
resdesc.DepthOrArraySize = 1; D3D12_RESOURCE_STATE_COPY_DEST,
resdesc.SampleDesc.Count = 1; nullptr,
resdesc.MipLevels = 1; IID_PPV_ARGS(&writeDest)
resdesc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; )
);
ID3D12Resource *writeDest; ID3D12GraphicsCommandList *downloadCommandList;
check( check(
m_device->CreateCommittedResource( m_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, getCurrentResourceStorage().m_commandAllocator, nullptr, IID_PPV_ARGS(&downloadCommandList))
&heapProp, );
D3D12_HEAP_FLAG_NONE,
&resdesc,
D3D12_RESOURCE_STATE_COPY_DEST,
nullptr,
IID_PPV_ARGS(&writeDest)
)
);
ID3D12GraphicsCommandList *downloadCommandList; D3D12_RESOURCE_BARRIER barrier = {};
check( barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
m_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, getCurrentResourceStorage().m_commandAllocator, nullptr, IID_PPV_ARGS(&downloadCommandList)) barrier.Transition.pResource = m_fbo->getDepthStencilTexture();
); barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_DEPTH_WRITE;
barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_SOURCE;
downloadCommandList->ResourceBarrier(1, &barrier);
D3D12_RESOURCE_BARRIER barrier = {}; size_t rowPitch = RSXThread::m_width * sizeof(float);
barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; rowPitch = (rowPitch + 255) & ~255;
barrier.Transition.pResource = m_fbo->getDepthStencilTexture();
barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_DEPTH_WRITE;
barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_SOURCE;
downloadCommandList->ResourceBarrier(1, &barrier);
size_t rowPitch = RSXThread::m_width * sizeof(float); D3D12_TEXTURE_COPY_LOCATION dst = {}, src = {};
rowPitch = (rowPitch + 255) & ~255; src.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
src.pResource = m_fbo->getDepthStencilTexture();
dst.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
dst.pResource = writeDest;
dst.PlacedFootprint.Offset = 0;
dst.PlacedFootprint.Footprint.Depth = 1;
dst.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R32_FLOAT;
dst.PlacedFootprint.Footprint.Height = RSXThread::m_height;
dst.PlacedFootprint.Footprint.Width = RSXThread::m_width;
dst.PlacedFootprint.Footprint.RowPitch = (UINT)rowPitch;
downloadCommandList->CopyTextureRegion(&dst, 0, 0, 0, &src, nullptr);
D3D12_TEXTURE_COPY_LOCATION dst = {}, src = {}; barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_SOURCE;
src.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_DEPTH_WRITE;
src.pResource = m_fbo->getDepthStencilTexture(); downloadCommandList->ResourceBarrier(1, &barrier);
dst.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
dst.pResource = writeDest;
dst.PlacedFootprint.Offset = 0;
dst.PlacedFootprint.Footprint.Depth = 1;
dst.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R32_FLOAT;
dst.PlacedFootprint.Footprint.Height = RSXThread::m_height;
dst.PlacedFootprint.Footprint.Width = RSXThread::m_width;
dst.PlacedFootprint.Footprint.RowPitch = (UINT)rowPitch;
downloadCommandList->CopyTextureRegion(&dst, 0, 0, 0, &src, nullptr);
barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_SOURCE; downloadCommandList->Close();
barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_DEPTH_WRITE; m_commandQueueGraphic->ExecuteCommandLists(1, (ID3D12CommandList**)&downloadCommandList);
downloadCommandList->ResourceBarrier(1, &barrier);
downloadCommandList->Close(); //Wait for result
m_commandQueueGraphic->ExecuteCommandLists(1, (ID3D12CommandList**)&downloadCommandList); 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);
m_commandQueueGraphic->Signal(fence, 1);
WaitForSingleObject(handle, INFINITE);
CloseHandle(handle);
//Wait for result char *ptrAsChar = (char*)ptr;
ID3D12Fence *fence; float *writeDestPtr;
check( check(writeDest->Map(0, nullptr, (void**)&writeDestPtr));
m_device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&fence)) // TODO : this should be done by the gpu
); for (unsigned row = 0; row < RSXThread::m_height; row++)
HANDLE handle = CreateEvent(0, FALSE, FALSE, 0); {
fence->SetEventOnCompletion(1, handle); for (unsigned i = 0; i < RSXThread::m_width; i++)
m_commandQueueGraphic->Signal(fence, 1);
WaitForSingleObject(handle, INFINITE);
CloseHandle(handle);
char *ptrAsChar = (char*)ptr;
float *writeDestPtr;
check(writeDest->Map(0, nullptr, (void**)&writeDestPtr));
// TODO : this should be done by the gpu
for (unsigned row = 0; row < RSXThread::m_height; row++)
{ {
for (unsigned i = 0; i < RSXThread::m_width; i++) unsigned char c = (unsigned char) (writeDestPtr[row * rowPitch / 4 + i] * 255.);
{ ptrAsChar[4 * (row * RSXThread::m_width + i)] = c;
unsigned char c = (unsigned char) (writeDestPtr[row * rowPitch / 4 + i] * 255.); ptrAsChar[4 * (row * RSXThread::m_width + i) + 1] = c;
ptrAsChar[4 * (row * RSXThread::m_width + i)] = c; ptrAsChar[4 * (row * RSXThread::m_width + i) + 2] = c;
ptrAsChar[4 * (row * RSXThread::m_width + i) + 1] = c; ptrAsChar[4 * (row * RSXThread::m_width + i) + 3] = c;
ptrAsChar[4 * (row * RSXThread::m_width + i) + 2] = c;
ptrAsChar[4 * (row * RSXThread::m_width + i) + 3] = c;
}
} }
}
writeDest->Release(); writeDest->Release();
fence->Release(); fence->Release();
downloadCommandList->Release(); downloadCommandList->Release();
} }
#endif #endif