From fcfc4ddfccd5ab998409304c164b73b62bb3c480 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Fri, 10 Dec 2021 11:08:21 +0200 Subject: [PATCH] v3dv: Fix V3DV_HAS_SURFACE preprocessor condition MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Currently V3DV_HAS_SURFACE is always defined. There is no WSI for Android in mesa3d, therefore WSI related extensions should not be exposed. 1. Define V3DV_HAS_SURFACE only for platforms which has WSI implemented. 2. Rename V3DV_HAS_SURFACE -> V3DV_USE_WSI_PLATFORM to align naming with other platforms. Fixes dEQP-VK.wsi.android.surface#query_protected_capabilities Fixes: 79e445143054 ("v3dv: move extensions table to v3dv_device") Signed-off-by: Roman Stratiienko Reviewed-by: Alejandro Piñeiro Part-of: --- src/broadcom/vulkan/v3dv_device.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index 084b3a7..89b13eb 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -75,11 +75,13 @@ v3dv_EnumerateInstanceVersion(uint32_t *pApiVersion) return VK_SUCCESS; } -#define V3DV_HAS_SURFACE (VK_USE_PLATFORM_WIN32_KHR || \ - VK_USE_PLATFORM_WAYLAND_KHR || \ - VK_USE_PLATFORM_XCB_KHR || \ - VK_USE_PLATFORM_XLIB_KHR || \ - VK_USE_PLATFORM_DISPLAY_KHR) +#if defined(VK_USE_PLATFORM_WIN32_KHR) || \ + defined(VK_USE_PLATFORM_WAYLAND_KHR) || \ + defined(VK_USE_PLATFORM_XCB_KHR) || \ + defined(VK_USE_PLATFORM_XLIB_KHR) || \ + defined(VK_USE_PLATFORM_DISPLAY_KHR) +#define V3DV_USE_WSI_PLATFORM +#endif static const struct vk_instance_extension_table instance_extensions = { .KHR_device_group_creation = true, @@ -91,7 +93,7 @@ static const struct vk_instance_extension_table instance_extensions = { .KHR_external_memory_capabilities = true, .KHR_external_semaphore_capabilities = true, .KHR_get_physical_device_properties2 = true, -#ifdef V3DV_HAS_SURFACE +#ifdef V3DV_USE_WSI_PLATFORM .KHR_get_surface_capabilities2 = true, .KHR_surface = true, .KHR_surface_protected_capabilities = true, -- 2.7.4