rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-22 16:54:27 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Fix initializing buffers with non-dword sizes

Browse Source 
Fixes #4641. This should be very rare in general though.
This commit is contained in:
Philip Rebohle 2025-01-24 22:28:10 +01:00
parent a3ba8fb4dc
commit d61ef79937
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/dxvk/dxvk_context.cpp
View File

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