Mesa (main): radv: only enable VK_EXT_display_control for vrcompositor (SteamVR)

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: db7ad0c1700e2f012730898e02bc0cebf1b04304
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db7ad0c1700e2f012730898e02bc0cebf1b04304

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Nov  1 19:29:31 2021 +0100

radv: only enable VK_EXT_display_control for vrcompositor (SteamVR)

One CTS test is still failing and the fix isn't upstream yet.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13623>

---

 src/amd/vulkan/radv_device.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 0572d0e4c17..12d54f1cf60 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -403,6 +403,15 @@ static void
 radv_physical_device_get_supported_extensions(const struct radv_physical_device *device,
                                               struct vk_device_extension_table *ext)
 {
+   bool enable_VK_EXT_display_control = false;
+
+   /* Only enable VK_EXT_display_control for vrcompositor (SteamVR) because one CTS test fails and
+    * the fix is still pending, see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12305.
+    */
+   if (device->instance->vk.app_info.app_name &&
+       !strcmp(device->instance->vk.app_info.app_name, "vrcompositor"))
+      enable_VK_EXT_display_control = true;
+
    *ext = (struct vk_device_extension_table){
       .KHR_8bit_storage = true,
       .KHR_16bit_storage = true,
@@ -480,7 +489,7 @@ radv_physical_device_get_supported_extensions(const struct radv_physical_device
       .EXT_descriptor_indexing = true,
       .EXT_discard_rectangles = true,
 #ifdef VK_USE_PLATFORM_DISPLAY_KHR
-      .EXT_display_control = true,
+      .EXT_display_control = enable_VK_EXT_display_control,
 #endif
       .EXT_extended_dynamic_state = true,
       .EXT_extended_dynamic_state2 = true,