1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-11 10:24:10 +01:00

[dxvk] Use new barrier helpers in copyBufferToImageHw

This commit is contained in:
Philip Rebohle 2024-10-12 09:19:13 +02:00 committed by Philip Rebohle
parent 389e40be67
commit d7dd80b62f

View File

@ -2828,9 +2828,8 @@ namespace dxvk {
auto dstSubresourceRange = vk::makeSubresourceRange(imageSubresource);
dstSubresourceRange.aspectMask = dstFormatInfo->aspectMask;
if (m_execBarriers.isImageDirty(image, dstSubresourceRange, DxvkAccess::Write)
|| m_execBarriers.isBufferDirty(bufferSlice, DxvkAccess::Read))
m_execBarriers.recordCommands(m_cmd);
flushPendingAccesses(*image, dstSubresourceRange, DxvkAccess::Write);
flushPendingAccesses(*buffer, bufferOffset, dataSize, DxvkAccess::Read);
// Initialize the image if the entire subresource is covered
VkImageLayout dstImageLayoutTransfer = image->pickLayout(VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
@ -2844,20 +2843,12 @@ namespace dxvk {
image, imageSubresource, imageOffset, imageExtent, dstImageLayoutTransfer,
bufferSlice, bufferRowAlignment, bufferSliceAlignment);
m_execBarriers.accessImage(
image, dstSubresourceRange,
dstImageLayoutTransfer,
VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_ACCESS_TRANSFER_WRITE_BIT,
image->info().layout,
image->info().stages,
image->info().access);
accessImage(DxvkCmdBuffer::ExecBuffer,
*image, dstSubresourceRange, dstImageLayoutTransfer,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT);
m_execBarriers.accessBuffer(bufferSlice,
VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_ACCESS_TRANSFER_READ_BIT,
buffer->info().stages,
buffer->info().access);
accessBuffer(DxvkCmdBuffer::ExecBuffer, *buffer, bufferOffset, dataSize,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT);
m_cmd->trackResource<DxvkAccess::Write>(image);
m_cmd->trackResource<DxvkAccess::Read>(buffer);