archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 13:31:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk: Only enable DCC workaround if the format features allow it

Browse source
This commit is contained in:
kd-11 2022-01-22 12:36:36 +03:00 • committed by kd-11
parent 801e7f3c2f
commit 6ffd38c393
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/RSX/VK/VKRenderTargets.h
View file

@ -89,7 +89,7 @@ namespace vk
using download_buffer_object = void*; using download_buffer_object = void*;
using barrier_descriptor_t = rsx::deferred_clipped_region<vk::render_target*>; using barrier_descriptor_t = rsx::deferred_clipped_region<vk::render_target*>;
static std::pair<VkImageUsageFlags, VkImageCreateFlags> get_attachment_create_flags(u8 samples) static std::pair<VkImageUsageFlags, VkImageCreateFlags> get_attachment_create_flags(VkFormat format, u8 samples)
{ {
if (g_cfg.video.strict_rendering_mode || samples > 1) if (g_cfg.video.strict_rendering_mode || samples > 1)
{ {
@ -101,7 +101,13 @@ namespace vk
switch (vk::get_driver_vendor()) switch (vk::get_driver_vendor())
{ {
case driver_vendor::ANV: case driver_vendor::ANV:
if (const auto format_features = vk::get_current_renderer()->get_format_properties(format);
format_features.optimalTilingFeatures & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT)
{
// Only set if supported by hw
return { VK_IMAGE_USAGE_STORAGE_BIT, 0 }; return { VK_IMAGE_USAGE_STORAGE_BIT, 0 };
}
break;
case driver_vendor::AMD: case driver_vendor::AMD:
case driver_vendor::RADV: case driver_vendor::RADV:
if (vk::get_chip_family() >= chip_class::AMD_navi1x) if (vk::get_chip_family() >= chip_class::AMD_navi1x)
@ -145,7 +151,7 @@ namespace vk
sample_layout = rsx::surface_sample_layout::null; sample_layout = rsx::surface_sample_layout::null;
} }
auto [usage_flags, create_flags] = get_attachment_create_flags(samples); auto [usage_flags, create_flags] = get_attachment_create_flags(requested_format, samples);
usage_flags |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT; usage_flags |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
if (samples == 1) [[likely]] if (samples == 1) [[likely]]
@ -214,7 +220,7 @@ namespace vk
sample_layout = rsx::surface_sample_layout::null; sample_layout = rsx::surface_sample_layout::null;
} }
auto [usage_flags, create_flags] = get_attachment_create_flags(samples); auto [usage_flags, create_flags] = get_attachment_create_flags(requested_format, samples);
usage_flags |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; usage_flags |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
if (samples == 1) [[likely]] if (samples == 1) [[likely]]