diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2024-04-04 13:37:09 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-04-04 21:57:46 +0000 |
| commit | 367cf70a2925e43b997041a27947a0f9cee9231c (patch) | |
| tree | 5b5b013632a070937cddf35e0ecacca3edab9a1d | |
| parent | 28eefbadeb3975b2c7b0e3fe3a61e1f1ea9cb049 (diff) | |
radv: move RADV_USE_WSI_PLATFORM define to radv_wsi.h
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28568>
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_instance.c | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_physical_device.c | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_private.h | 5 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_wsi.h | 5 |
5 files changed, 8 insertions, 5 deletions
diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 5a34a198247..a8a5343c151 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -40,6 +40,7 @@ #include "radv_radeon_winsys.h" #include "radv_rmv.h" #include "radv_video.h" +#include "radv_wsi.h" #include "sid.h" #include "vk_debug_utils.h" #include "vk_format.h" diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c index 6589e068bba..5a09e1260e9 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c @@ -28,6 +28,7 @@ #include "radv_instance.h" #include "radv_debug.h" #include "radv_private.h" +#include "radv_wsi.h" #include "util/driconf.h" diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index e817555d236..f129a78998e 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -37,6 +37,7 @@ #include "radv_android.h" #include "radv_debug.h" #include "radv_instance.h" +#include "radv_physical_device.h" #include "radv_pipeline_rt.h" #include "radv_private.h" #include "radv_video.h" diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 96555d4821c..c0d472407c9 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -102,11 +102,6 @@ extern "C" { #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 __cplusplus } #endif diff --git a/src/amd/vulkan/radv_wsi.h b/src/amd/vulkan/radv_wsi.h index ef4c931708e..a8fd198a35e 100644 --- a/src/amd/vulkan/radv_wsi.h +++ b/src/amd/vulkan/radv_wsi.h @@ -30,6 +30,11 @@ #include "radv_physical_device.h" +#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 + VkResult radv_init_wsi(struct radv_physical_device *pdev); void radv_finish_wsi(struct radv_physical_device *pdev); |