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

[dxvk] Always use SAMPLE_ZERO for implicit resolves

Browse Source
This commit is contained in:
Philip Rebohle 2025-03-05 11:34:47 +01:00
parent 54b0b09cc9
commit 6d6825067b
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dxvk/dxvk_context.cpp
View File

@ -7760,8 +7760,21 @@ namespace dxvk {
prepareImage(op.inputImage, vk::makeSubresourceRange(op.resolveRegion.srcSubresource)); prepareImage(op.inputImage, vk::makeSubresourceRange(op.resolveRegion.srcSubresource));
prepareImage(op.resolveImage, vk::makeSubresourceRange(op.resolveRegion.dstSubresource)); prepareImage(op.resolveImage, vk::makeSubresourceRange(op.resolveRegion.dstSubresource));
// Always do a SAMPLE_ZERO resolve here since that's less expensive and closer to what
// happens on native AMD anyway. Need to use a shader in case we are dealing with a
// non-integer color image since render pass resolves only support AVERAGE.
auto formatInfo = lookupFormatInfo(op.resolveFormat);
bool useRp = (formatInfo->flags.any(DxvkFormatFlag::SampledSInt, DxvkFormatFlag::SampledUInt))
|| (formatInfo->aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT));
if (useRp) {
resolveImageRp(op.resolveImage, op.inputImage, op.resolveRegion, resolveImageRp(op.resolveImage, op.inputImage, op.resolveRegion,
op.resolveFormat, op.resolveMode, op.resolveMode); op.resolveFormat, VK_RESOLVE_MODE_SAMPLE_ZERO_BIT, VK_RESOLVE_MODE_SAMPLE_ZERO_BIT);
} else {
resolveImageFb(op.resolveImage, op.inputImage, op.resolveRegion,
op.resolveFormat, VK_RESOLVE_MODE_SAMPLE_ZERO_BIT, VK_RESOLVE_MODE_NONE);
}
} }
} }

5
src/dxvk/dxvk_implicit_resolve.cpp
View File

@ -129,11 +129,6 @@ namespace dxvk {
op.resolveRegion.dstSubresource.baseArrayLayer = 0u; op.resolveRegion.dstSubresource.baseArrayLayer = 0u;
op.resolveRegion.extent = view.resolveView->mipLevelExtent(0u); op.resolveRegion.extent = view.resolveView->mipLevelExtent(0u);
op.resolveFormat = view.inputView->info().format; op.resolveFormat = view.inputView->info().format;
op.resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT;
if ((format->flags.any(DxvkFormatFlag::SampledSInt, DxvkFormatFlag::SampledUInt)
|| (format->aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))))
op.resolveMode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT;
view.resolveDone = true; view.resolveDone = true;
} }

1
src/dxvk/dxvk_implicit_resolve.h
View File

@ -20,7 +20,6 @@ namespace dxvk {
Rc<DxvkImage> resolveImage = nullptr; Rc<DxvkImage> resolveImage = nullptr;
VkImageResolve resolveRegion = { }; VkImageResolve resolveRegion = { };
VkFormat resolveFormat = VK_FORMAT_UNDEFINED; VkFormat resolveFormat = VK_FORMAT_UNDEFINED;
VkResolveModeFlagBits resolveMode = VK_RESOLVE_MODE_NONE;
}; };