Module: Mesa Branch: staging/21.3 Commit: 654e2b631c9b3ddc05c1f3427f9bbd12df47ae28 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=654e2b631c9b3ddc05c1f3427f9bbd12df47ae28
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> (cherry picked from commit 90994e4db7000951be058a956813e4a828f862c9) --- .pick_status.json | 2 +- 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 ++++ 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 1a5ee9c89d9..9ddf6e9debd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -247,7 +247,7 @@ "description": "radv: add drirc radv_disable_htile_layers and enable it for F1 2021", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 4f041eb9bad..258429ad95e 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -909,6 +909,7 @@ static const driOptionDescription radv_dri_options[] = { DRI_CONF_RADV_DISABLE_TC_COMPAT_HTILE_GENERAL(false) DRI_CONF_RADV_DISABLE_DCC(false) DRI_CONF_RADV_REPORT_APU_AS_DGPU(false) + DRI_CONF_RADV_DISABLE_HTILE_LAYERS(false) DRI_CONF_SECTION_END }; // clang-format on @@ -951,6 +952,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"); } VkResult diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index cd5a782d395..ce4df33bafa 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 a4fec8e582c..972a2c6854f 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -320,6 +320,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 b9704cd26a0..7e80ba18e89 100644 --- a/src/util/00-mesa-defaults.conf +++ b/src/util/00-mesa-defaults.conf @@ -878,6 +878,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> <!-- The android game hall of shame: diff --git a/src/util/driconf.h b/src/util/driconf.h index b708a2d8c86..a5380e2a8fa 100644 --- a/src/util/driconf.h +++ b/src/util/driconf.h @@ -520,4 +520,8 @@ DRI_CONF_OPT_B(radv_report_apu_as_dgpu, def, \ "Report APUs as discrete GPUs instead of integrated GPUs") +#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
