rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-15 07:29:17 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Fix various issues in UpdateTexture

Browse Source 
- Skip copies for empty or invalid rects
- align up the extent
- use util functions to slightly clean up the code
This commit is contained in:
Robin Kertels 2021-02-27 17:04:07 +01:00 committed by Joshie
parent fa947774b0
commit eec4481ca0
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/d3d9/d3d9_device.cpp
View File

@ -754,40 +754,41 @@ namespace dxvk {
for (uint32_t a = 0; a < arraySlices; a++) { for (uint32_t a = 0; a < arraySlices; a++) {
const D3DBOX& box = srcTexInfo->GetUpdateDirtyBox(a); const D3DBOX& box = srcTexInfo->GetUpdateDirtyBox(a);
if (box.Left >= box.Right || box.Top >= box.Bottom || box.Front >= box.Back)
continue;
for (uint32_t m = 0; m < mipLevels; m++) { for (uint32_t m = 0; m < mipLevels; m++) {
Rc<DxvkBuffer> srcBuffer = srcTexInfo->GetBuffer(srcTexInfo->CalcSubresource(a, m)); Rc<DxvkBuffer> srcBuffer = srcTexInfo->GetBuffer(srcTexInfo->CalcSubresource(a, m));
VkImageSubresourceLayers dstLayers = { VK_IMAGE_ASPECT_COLOR_BIT, m, a, 1 }; VkImageSubresourceLayers dstLayers = { VK_IMAGE_ASPECT_COLOR_BIT, m, a, 1 };
VkOffset3D offset = { VkOffset3D scaledBoxOffset = {
alignDown(int32_t(box.Left) >> m, int32_t(formatInfo->blockSize.width)), int32_t(alignDown(box.Left >> m, formatInfo->blockSize.width)),
alignDown(int32_t(box.Top) >> m, int32_t(formatInfo->blockSize.height)), int32_t(alignDown(box.Top >> m, formatInfo->blockSize.height)),
alignDown(int32_t(box.Front) >> m, int32_t(formatInfo->blockSize.depth)) int32_t(alignDown(box.Front >> m, formatInfo->blockSize.depth))
};
VkExtent3D extent = {
alignDown(uint32_t((box.Right - box.Left) >> m), formatInfo->blockSize.width),
alignDown(uint32_t((box.Bottom - box.Top) >> m), formatInfo->blockSize.height),
alignDown(uint32_t((box.Back - box.Front) >> m), formatInfo->blockSize.depth),
}; };
VkExtent3D scaledBoxExtent = util::computeMipLevelExtent({
uint32_t(box.Right - box.Left),
uint32_t(box.Bottom - box.Top),
uint32_t(box.Back - box.Front)
}, m);
VkExtent3D scaledBoxExtentBlockCount = util::computeBlockCount(scaledBoxExtent, formatInfo->blockSize);
VkExtent3D scaledAlignedBoxExtent = util::computeBlockExtent(scaledBoxExtentBlockCount, formatInfo->blockSize);
VkExtent3D levelExtent = dstImage->mipLevelExtent(m); VkExtent3D texLevelExtent = dstImage->mipLevelExtent(m);
VkExtent3D blockCount = util::computeBlockCount(levelExtent, formatInfo->blockSize); VkExtent3D texLevelExtentBlockCount = util::computeBlockCount(texLevelExtent, formatInfo->blockSize);
VkOffset3D srcByteOffset = { VkOffset3D boxOffsetBlockCount = util::computeBlockOffset(scaledBoxOffset, formatInfo->blockSize);
offset.x / int32_t(formatInfo->blockSize.width), VkDeviceSize srcOffset = boxOffsetBlockCount.z * formatInfo->elementSize * texLevelExtentBlockCount.depth
offset.y / int32_t(formatInfo->blockSize.height), + boxOffsetBlockCount.y * formatInfo->elementSize * texLevelExtentBlockCount.width
offset.z / int32_t(formatInfo->blockSize.depth) + boxOffsetBlockCount.x * formatInfo->elementSize;
}; VkExtent2D srcExtent = VkExtent2D{ texLevelExtentBlockCount.width * formatInfo->blockSize.width,
VkDeviceSize srcOffset = srcByteOffset.z * formatInfo->elementSize * blockCount.depth texLevelExtentBlockCount.height * formatInfo->blockSize.height };
+ srcByteOffset.y * formatInfo->elementSize * blockCount.width
+ srcByteOffset.x * formatInfo->elementSize;
VkExtent2D srcExtent = VkExtent2D{ blockCount.width * formatInfo->blockSize.width,
blockCount.height * formatInfo->blockSize.height };
EmitCs([ EmitCs([
cDstImage = dstImage, cDstImage = dstImage,
cSrcBuffer = srcBuffer, cSrcBuffer = srcBuffer,
cDstLayers = dstLayers, cDstLayers = dstLayers,
cExtent = extent, cExtent = scaledAlignedBoxExtent,
cOffset = offset, cOffset = scaledBoxOffset,
cSrcOffset = srcOffset, cSrcOffset = srcOffset,
cSrcExtent = srcExtent cSrcExtent = srcExtent
] (DxvkContext* ctx) { ] (DxvkContext* ctx) {