diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2023-03-07 13:21:55 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-03-08 18:00:17 +0000 |
| commit | 8292375d11c536ba29a36ace63923b36a3f02c94 (patch) | |
| tree | f8034872aa8b2a3e4c654b6361c11a29222c8e7b | |
| parent | 15a2c3d198e45b3424e35933cbfeb6ba79751f80 (diff) | |
| download | mesa-8292375d11c536ba29a36ace63923b36a3f02c94.tar.gz | |
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 <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21763>
(cherry picked from commit c87c34bbba3b0d0890c050d34f4b7165b29b7326)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 5 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_private.h | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.pick_status.json b/.pick_status.json index 8d6975acac3..4ef665fde51 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -823,7 +823,7 @@ "description": "radv: fix defining RADV_USE_WSI_PLATFORM", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2a5d7f4926c8b3dc702d3ee0e216c563ba7e94db" }, diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index eec7833bebd..4dbcb07b206 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -409,11 +409,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 f3728ab00be..ae39c93f44c 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -117,6 +117,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 |