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

[d3d9] Fix pitch when copying straight from mapping buffer

Browse Source
This commit is contained in:
Robin Kertels 2021-07-17 14:50:45 +02:00 committed by Joshie
parent 34101dcf26
commit 584e1515b1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d9/d3d9_device.cpp
View File

@ -4364,12 +4364,12 @@ namespace dxvk {
+ boxOffsetBlockCount.y * texLevelExtentBlockCount.width + boxOffsetBlockCount.y * texLevelExtentBlockCount.width
+ boxOffsetBlockCount.x) + boxOffsetBlockCount.x)
* formatInfo->elementSize; * formatInfo->elementSize;
VkDeviceSize pitch = align(texLevelExtentBlockCount.width * formatInfo->elementSize, 4);
VkDeviceSize rowAlignment = 0; VkDeviceSize rowAlignment = 0;
DxvkBufferSlice copySrcSlice; DxvkBufferSlice copySrcSlice;
if (pResource->DoesStagingBufferUploads(Subresource)) { if (pResource->DoesStagingBufferUploads(Subresource)) {
VkDeviceSize dirtySize = scaledBoxExtentBlockCount.width * scaledBoxExtentBlockCount.height * scaledBoxExtentBlockCount.depth * formatInfo->elementSize; VkDeviceSize dirtySize = scaledBoxExtentBlockCount.width * scaledBoxExtentBlockCount.height * scaledBoxExtentBlockCount.depth * formatInfo->elementSize;
VkDeviceSize pitch = align(texLevelExtentBlockCount.width * formatInfo->elementSize, 4);
D3D9BufferSlice slice = AllocTempBuffer<false>(dirtySize); D3D9BufferSlice slice = AllocTempBuffer<false>(dirtySize);
copySrcSlice = slice.slice; copySrcSlice = slice.slice;
void* srcData = reinterpret_cast<uint8_t*>(srcSlice.mapPtr) + copySrcOffset; void* srcData = reinterpret_cast<uint8_t*>(srcSlice.mapPtr) + copySrcOffset;
@ -4378,7 +4378,7 @@ namespace dxvk {
pitch, pitch * texLevelExtentBlockCount.height); pitch, pitch * texLevelExtentBlockCount.height);
} else { } else {
copySrcSlice = DxvkBufferSlice(pResource->GetBuffer(Subresource), copySrcOffset, srcSlice.length); copySrcSlice = DxvkBufferSlice(pResource->GetBuffer(Subresource), copySrcOffset, srcSlice.length);
rowAlignment = 4; rowAlignment = pitch; // row alignment can act as the pitch parameter
} }
EmitCs([ EmitCs([