From dc7d0d6a583e93026536d84b506c2ff12ddef766 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 17 Jun 2024 14:41:13 +0200 Subject: [PATCH] panvk: move macro-definition to header This define is used in panvk_physical_device.c as well, so it needs to be visible there. Fixes: ac34183ec3d ("panvk: Move the VkPhysicalDevice logic to panvk_physical_device.{c,h}") Reviewed-by: Boris Brezillon Part-of: (cherry picked from commit 9336190868dc7cf25135e304b90c4948bea41662) --- .pick_status.json | 2 +- src/panfrost/vulkan/panvk_instance.c | 4 ---- src/panfrost/vulkan/panvk_instance.h | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ddf6ae6ba6a..466f374ab3e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -854,7 +854,7 @@ "description": "panvk: move macro-definition to header", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ac34183ec3df1435481f345d87f06ee949ed43c7", "notes": null diff --git a/src/panfrost/vulkan/panvk_instance.c b/src/panfrost/vulkan/panvk_instance.c index 8045c0ad65d..9300f35caa2 100644 --- a/src/panfrost/vulkan/panvk_instance.c +++ b/src/panfrost/vulkan/panvk_instance.c @@ -35,10 +35,6 @@ static const struct debug_control panvk_debug_options[] = { {"no_known_warn", PANVK_DEBUG_NO_KNOWN_WARN}, {NULL, 0}}; -#if defined(VK_USE_PLATFORM_WAYLAND_KHR) -#define PANVK_USE_WSI_PLATFORM -#endif - VKAPI_ATTR VkResult VKAPI_CALL panvk_EnumerateInstanceVersion(uint32_t *pApiVersion) { diff --git a/src/panfrost/vulkan/panvk_instance.h b/src/panfrost/vulkan/panvk_instance.h index 0572c3e7e70..0ffe6b0978f 100644 --- a/src/panfrost/vulkan/panvk_instance.h +++ b/src/panfrost/vulkan/panvk_instance.h @@ -23,6 +23,10 @@ enum panvk_debug_flags { PANVK_DEBUG_NO_KNOWN_WARN = 1 << 7, }; +#if defined(VK_USE_PLATFORM_WAYLAND_KHR) +#define PANVK_USE_WSI_PLATFORM +#endif + struct panvk_instance { struct vk_instance vk;