From c87c34bbba3b0d0890c050d34f4b7165b29b7326 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 7 Mar 2023 13:21:55 +0100 Subject: [PATCH] radv: fix defining RADV_USE_WSI_PLATFORM RADV_USE_WSI_PLATFORM was unused in radv_CreateImage(). Fixes: 2a5d7f4926c ("radv: fix missing implementation of creating images from swapchains") Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_device.c | 5 ----- src/amd/vulkan/radv_private.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index fa0d0b5374f..b9848849ad6 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -440,11 +440,6 @@ radv_NV_device_generated_commands_enabled(const struct radv_physical_device *dev driQueryOptionb(&device->instance->dri_options, "radv_dgc"); } -#if 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 RADV_USE_WSI_PLATFORM -#endif - #ifdef ANDROID #define RADV_API_VERSION VK_MAKE_VERSION(1, 1, VK_HEADER_VERSION) #else diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index f7d8fe3a956..abce10b5d5b 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -122,6 +122,11 @@ extern "C" #define RADV_SUPPORT_ANDROID_HARDWARE_BUFFER 0 #endif +#if 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 RADV_USE_WSI_PLATFORM +#endif + #ifdef _WIN32 #define RADV_SUPPORT_CALIBRATED_TIMESTAMPS 0 #else