niansa-misc/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-06 20:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

[dxvk] Move buffer initialization to transfer queue

Browse source
This commit is contained in:
Philip Rebohle 2025-03-01 13:17:48 +01:00
parent 83023cb63d
commit 49479a27e5
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/dxvk/dxvk_context.cpp
View file

@ -1008,45 +1008,49 @@ namespace dxvk {
void DxvkContext::initBuffer( void DxvkContext::initBuffer(
const Rc<DxvkBuffer>& buffer) { const Rc<DxvkBuffer>& buffer) {
auto slice = buffer->getSliceHandle(); auto dstSlice = buffer->getSliceHandle();
// Buffer size may be misaligned, in which case we have // Buffer size may be misaligned, in which case we have
// to use a plain buffer copy to fill the last few bytes. // to use a plain buffer copy to fill the last few bytes.
constexpr VkDeviceSize MinCopyAndFillSize = 1u << 20; constexpr VkDeviceSize MinCopyAndFillSize = 1u << 20;
VkDeviceSize copySize = slice.length & 3u; VkDeviceSize copySize = dstSlice.length & 3u;
VkDeviceSize fillSize = slice.length - copySize; VkDeviceSize fillSize = dstSlice.length - copySize;
// If the buffer is small, just dispatch one single copy // If the buffer is small, just dispatch one single copy
if (copySize && slice.length < MinCopyAndFillSize) { if (copySize && dstSlice.length < MinCopyAndFillSize) {
copySize = slice.length; copySize = dstSlice.length;
fillSize = 0u; fillSize = 0u;
} }
if (fillSize) { if (fillSize) {
m_cmd->cmdFillBuffer(DxvkCmdBuffer::InitBuffer, m_cmd->cmdFillBuffer(DxvkCmdBuffer::SdmaBuffer,
slice.handle, slice.offset, fillSize, 0u); dstSlice.handle, dstSlice.offset, fillSize, 0u);
} }
if (copySize) { if (copySize) {
auto zero = createZeroBuffer(copySize)->getSliceHandle(); auto srcSlice = createZeroBuffer(copySize)->getSliceHandle();
VkBufferCopy2 copyRegion = { VK_STRUCTURE_TYPE_BUFFER_COPY_2 }; VkBufferCopy2 copyRegion = { VK_STRUCTURE_TYPE_BUFFER_COPY_2 };
copyRegion.srcOffset = zero.offset; copyRegion.srcOffset = srcSlice.offset;
copyRegion.dstOffset = slice.offset + fillSize; copyRegion.dstOffset = dstSlice.offset + fillSize;
copyRegion.size = copySize; copyRegion.size = copySize;
VkCopyBufferInfo2 copyInfo = { VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2 }; VkCopyBufferInfo2 copyInfo = { VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2 };
copyInfo.srcBuffer = zero.handle; copyInfo.srcBuffer = srcSlice.handle;
copyInfo.dstBuffer = slice.handle; copyInfo.dstBuffer = dstSlice.handle;
copyInfo.regionCount = 1; copyInfo.regionCount = 1;
copyInfo.pRegions = &copyRegion; copyInfo.pRegions = &copyRegion;
m_cmd->cmdCopyBuffer(DxvkCmdBuffer::InitBuffer, &copyInfo); m_cmd->cmdCopyBuffer(DxvkCmdBuffer::SdmaBuffer, &copyInfo);
} }
accessMemory(DxvkCmdBuffer::InitBuffer, accessMemory(DxvkCmdBuffer::SdmaBuffer,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_NONE);
accessMemory(DxvkCmdBuffer::InitBarriers,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_NONE,
buffer->info().stages, buffer->info().access); buffer->info().stages, buffer->info().access);
m_cmd->track(buffer, DxvkAccess::Write); m_cmd->track(buffer, DxvkAccess::Write);