Mesa (staging/21.3): v3dv: Fix dEQP-VK.info#instance_extensions test

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 9201766846ad563c8dd2823e74162623f793dc10
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9201766846ad563c8dd2823e74162623f793dc10

Author: Roman Stratiienko <roman.o.stratiienko at globallogic.com>
Date:   Fri Dec  3 18:38:27 2021 +0200

v3dv: Fix dEQP-VK.info#instance_extensions test

When mesa3d is built without VK_USE_PLATFORM_DISPLAY_KHR definition,
dEQP test fails:

    dEQP    : Test case 'dEQP-VK.info.instance_extensions'..
    dEQP    :   Fail (Extension VK_KHR_get_display_properties2 is missing
                                                 dependency: VK_KHR_display)
    dEQP    : DONE!

Enable KHR_get_display_properties2 only if VK_USE_PLATFORM_DISPLAY_KHR
is enabled.

Fixes: f884c2e3be36 ("v3dv: implement VK_KHR_get_display_properties2")
Signed-off-by: Roman Stratiienko <roman.o.stratiienko at globallogic.com>
Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14047>
(cherry picked from commit 72db15913f63344cd8f01e6682c2079727762d3b)

---

 .pick_status.json                 | 2 +-
 src/broadcom/vulkan/v3dv_device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 3cc7c4e59bb..fc79a926b78 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -625,7 +625,7 @@
         "description": "v3dv: Fix dEQP-VK.info#instance_extensions test",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f884c2e3be363903a59dbee01868c7ad0bf0f346"
     },
diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c
index 7435499c930..9801d3a171f 100644
--- a/src/broadcom/vulkan/v3dv_device.c
+++ b/src/broadcom/vulkan/v3dv_device.c
@@ -85,11 +85,11 @@ static const struct vk_instance_extension_table instance_extensions = {
    .KHR_device_group_creation           = true,
 #ifdef VK_USE_PLATFORM_DISPLAY_KHR
    .KHR_display                         = true,
+   .KHR_get_display_properties2         = true,
 #endif
    .KHR_external_fence_capabilities     = true,
    .KHR_external_memory_capabilities    = true,
    .KHR_external_semaphore_capabilities = true,
-   .KHR_get_display_properties2         = true,
    .KHR_get_physical_device_properties2 = true,
 #ifdef V3DV_HAS_SURFACE
    .KHR_get_surface_capabilities2       = true,