Module: Mesa Branch: main Commit: 90994e4db7000951be058a956813e4a828f862c9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90994e4db7000951be058a956813e4a828f862c9
Author: Samuel Pitoiset <[email protected]> Date: Thu Dec 30 18:24:10 2021 +0100 radv: add drirc radv_disable_htile_layers and enable it for F1 2021 To workaround some flickering issues in the main menu. See https://github.com/HansKristian-Work/vkd3d-proton/issues/950 Cc: 21.3 mesa-stable Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14354> --- src/amd/vulkan/radv_device.c | 4 ++++ src/amd/vulkan/radv_image.c | 3 +++ src/amd/vulkan/radv_private.h | 1 + src/util/00-mesa-defaults.conf | 4 ++++ src/util/driconf.h | 4 ++++ 5 files changed, 16 insertions(+) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 0e1a56b7542..1c124610ea4 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -934,6 +934,7 @@ static const driOptionDescription radv_dri_options[] = { DRI_CONF_RADV_DISABLE_DCC(false) DRI_CONF_RADV_REPORT_APU_AS_DGPU(false) DRI_CONF_RADV_REQUIRE_ETC2(false) + DRI_CONF_RADV_DISABLE_HTILE_LAYERS(false) DRI_CONF_SECTION_END }; // clang-format on @@ -976,6 +977,9 @@ radv_init_dri_options(struct radv_instance *instance) instance->report_apu_as_dgpu = driQueryOptionb(&instance->dri_options, "radv_report_apu_as_dgpu"); + + instance->disable_htile_layers = + driQueryOptionb(&instance->dri_options, "radv_disable_htile_layers"); } VKAPI_ATTR VkResult VKAPI_CALL diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 2873e80c509..53d52d79de4 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -365,6 +365,9 @@ radv_use_htile_for_image(const struct radv_device *device, const struct radv_ima !device->attachment_vrs_enabled) return false; + if (device->instance->disable_htile_layers && image->info.array_size > 1) + return false; + return (image->info.levels == 1 || use_htile_for_mips) && !image->shareable; } diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 14df0e5d53d..05ba53434ab 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -337,6 +337,7 @@ struct radv_instance { bool disable_shrink_image_store; bool absolute_depth_bias; bool report_apu_as_dgpu; + bool disable_htile_layers; }; VkResult radv_init_wsi(struct radv_physical_device *physical_device); diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf index f52daf00899..82f4b8bd992 100644 --- a/src/util/00-mesa-defaults.conf +++ b/src/util/00-mesa-defaults.conf @@ -951,6 +951,10 @@ TODO: document the other workarounds. <application name="Resident Evil Village" application_name_match="re8.exe"> <option name="radv_invariant_geom" value="true" /> </application> + + <application name="F1 2021" application_name_match="F1_2021_dx12.exe"> + <option name="radv_disable_htile_layers" value="true" /> + </application> </device> <device driver="virtio_gpu"> diff --git a/src/util/driconf.h b/src/util/driconf.h index fc1164087de..14fe35e7ddd 100644 --- a/src/util/driconf.h +++ b/src/util/driconf.h @@ -560,4 +560,8 @@ DRI_CONF_OPT_B(radv_require_etc2, def, \ "Implement emulated ETC2 on HW that does not support it") +#define DRI_CONF_RADV_DISABLE_HTILE_LAYERS(def) \ + DRI_CONF_OPT_B(radv_disable_htile_layers, def, \ + "Disable HTILE for layered depth/stencil formats") + #endif
