niansa-misc/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-06 20:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

[dxvk] Always prefer render pass resolves

Browse source 
Current AMDVLK has faster render pass resolves than what we can do
with fmask, and our render pass resolve path can deal with all types
of color images now if we pass the correct resolve mode.

Keep the fb path for non-standard depth resolve modes as well as
swapchain blits with composition, but otherwise there is no reason
to use this path by default anymore.
This commit is contained in:
Philip Rebohle 2025-03-05 00:07:09 +01:00
parent 72d67435fb
commit 71a85d2661
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/dxvk/dxvk_context.cpp
View file

@ -1950,22 +1950,27 @@ namespace dxvk {
this->prepareImage(dstImage, vk::makeSubresourceRange(region.dstSubresource));
this->prepareImage(srcImage, vk::makeSubresourceRange(region.srcSubresource));
bool useFb = srcImage->info().format != format
auto formatInfo = lookupFormatInfo(format);
bool useRp = srcImage->info().format != format
|| dstImage->info().format != format;
if (m_device->perfHints().preferFbResolve) {
useFb |= (dstImage->info().usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)
&& (srcImage->info().usage & VK_IMAGE_USAGE_SAMPLED_BIT);
}
useRp |= (srcImage->info().usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)
&& (dstImage->info().usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
if (!useFb) {
this->resolveImageHw(
dstImage, srcImage, region);
if (useRp) {
// Work out resolve mode based on format properties. For color images,
// we must use AVERAGE unless the resolve uses an integer format.
VkResolveModeFlagBits mode = VK_RESOLVE_MODE_AVERAGE_BIT;
if (formatInfo->flags.any(DxvkFormatFlag::SampledSInt, DxvkFormatFlag::SampledUInt)
|| (formatInfo->aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)))
mode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT;
this->resolveImageRp(dstImage, srcImage, region,
format, mode, mode);
} else {
this->resolveImageFb(
dstImage, srcImage, region, format,
VK_RESOLVE_MODE_NONE,
VK_RESOLVE_MODE_NONE);
this->resolveImageHw(dstImage, srcImage, region);
}
}

3
src/dxvk/dxvk_device.cpp
View file

@ -427,9 +427,6 @@ namespace dxvk {
&& (m_adapter->matchesDriver(VK_DRIVER_ID_MESA_RADV_KHR)
|| m_adapter->matchesDriver(VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR)
|| m_adapter->matchesDriver(VK_DRIVER_ID_AMD_PROPRIETARY_KHR));
hints.preferFbResolve = m_features.amdShaderFragmentMask
&& (m_adapter->matchesDriver(VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR)
|| m_adapter->matchesDriver(VK_DRIVER_ID_AMD_PROPRIETARY_KHR));
// Older Nvidia drivers sometimes use the wrong format
// to interpret the clear color in render pass clears.

1
src/dxvk/dxvk_device.h
View file

@ -36,7 +36,6 @@ namespace dxvk {
*/
struct DxvkDevicePerfHints {
VkBool32 preferFbDepthStencilCopy : 1;
VkBool32 preferFbResolve : 1;
VkBool32 renderPassClearFormatBug : 1;
VkBool32 preferRenderPassOps : 1;
VkBool32 preferPrimaryCmdBufs : 1;