rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-04 16:24:29 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] ResolveZ: Only copy aspects that both images support

Browse Source
This commit is contained in:
Robin Kertels 2024-09-25 00:23:57 +02:00 committed by misyl
parent d7c2e3ac76
commit f5ca3cf5df
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/d3d9/d3d9_device.cpp
View File

@ -7640,14 +7640,26 @@ namespace dxvk {
const D3D9_VK_FORMAT_MAPPING srcFormatInfo = LookupFormat(srcDesc->Format); const D3D9_VK_FORMAT_MAPPING srcFormatInfo = LookupFormat(srcDesc->Format);
const D3D9_VK_FORMAT_MAPPING dstFormatInfo = LookupFormat(dstDesc->Format); const D3D9_VK_FORMAT_MAPPING dstFormatInfo = LookupFormat(dstDesc->Format);
const VkImageSubresource dstSubresource = VkImageSubresource dstSubresource =
dstTextureInfo->GetSubresourceFromIndex( dstTextureInfo->GetSubresourceFromIndex(
dstFormatInfo.Aspect, 0); dstFormatInfo.Aspect, 0);
const VkImageSubresource srcSubresource = VkImageSubresource srcSubresource =
srcTextureInfo->GetSubresourceFromIndex( srcTextureInfo->GetSubresourceFromIndex(
srcFormatInfo.Aspect, src->GetSubresource()); srcFormatInfo.Aspect, src->GetSubresource());
if ((dstSubresource.aspectMask & srcSubresource.aspectMask) != 0) {
// for depthStencil -> depth or depthStencil -> stencil copies, only copy the aspect that both images support
dstSubresource.aspectMask = dstSubresource.aspectMask & srcSubresource.aspectMask;
srcSubresource.aspectMask = dstSubresource.aspectMask & srcSubresource.aspectMask;
} else if (unlikely(dstSubresource.aspectMask != VK_IMAGE_ASPECT_COLOR_BIT && srcSubresource.aspectMask != VK_IMAGE_ASPECT_COLOR_BIT)) {
Logger::err(str::format("D3D9DeviceEx::ResolveZ: Trying to blit from ",
srcFormatInfo.FormatColor, " (aspect ", srcSubresource.aspectMask, ")", " to ",
dstFormatInfo.FormatColor, " (aspect ", dstSubresource.aspectMask, ")"
));
return;
}
const VkImageSubresourceLayers dstSubresourceLayers = { const VkImageSubresourceLayers dstSubresourceLayers = {
dstSubresource.aspectMask, dstSubresource.aspectMask,
dstSubresource.mipLevel, dstSubresource.mipLevel,