From 84cb56815029fef4452a11aacac6f28f6f2787c2 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Mon, 23 Jun 2025 14:22:05 -0700 Subject: [PATCH] vulkan/wsi: drop wsi_common_get_images ..since there's no users of it now. Reviewed-by: Jesse Natalie Part-of: --- src/vulkan/wsi/wsi_common.c | 32 +++++++++++--------------------- src/vulkan/wsi/wsi_common.h | 5 ----- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index a71011ed545..2f8879ea75d 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -1120,23 +1120,6 @@ wsi_ReleaseSwapchainImagesEXT(VkDevice _device, return VK_SUCCESS; } -VkResult -wsi_common_get_images(VkSwapchainKHR _swapchain, - uint32_t *pSwapchainImageCount, - VkImage *pSwapchainImages) -{ - VK_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain); - VK_OUTARRAY_MAKE_TYPED(VkImage, images, pSwapchainImages, pSwapchainImageCount); - - for (uint32_t i = 0; i < swapchain->image_count; i++) { - vk_outarray_append_typed(VkImage, &images, image) { - *image = swapchain->get_wsi_image(swapchain, i)->image; - } - } - - return vk_outarray_status(&images); -} - VkImage wsi_common_get_image(VkSwapchainKHR _swapchain, uint32_t index) { @@ -1147,14 +1130,21 @@ wsi_common_get_image(VkSwapchainKHR _swapchain, uint32_t index) VKAPI_ATTR VkResult VKAPI_CALL wsi_GetSwapchainImagesKHR(VkDevice device, - VkSwapchainKHR swapchain, + VkSwapchainKHR _swapchain, uint32_t *pSwapchainImageCount, VkImage *pSwapchainImages) { MESA_TRACE_FUNC(); - return wsi_common_get_images(swapchain, - pSwapchainImageCount, - pSwapchainImages); + VK_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain); + VK_OUTARRAY_MAKE_TYPED(VkImage, images, pSwapchainImages, pSwapchainImageCount); + + for (uint32_t i = 0; i < swapchain->image_count; i++) { + vk_outarray_append_typed(VkImage, &images, image) { + *image = swapchain->get_wsi_image(swapchain, i)->image; + } + } + + return vk_outarray_status(&images); } VKAPI_ATTR VkResult VKAPI_CALL diff --git a/src/vulkan/wsi/wsi_common.h b/src/vulkan/wsi/wsi_common.h index 5488c904e6c..017ae2b66f7 100644 --- a/src/vulkan/wsi/wsi_common.h +++ b/src/vulkan/wsi/wsi_common.h @@ -327,11 +327,6 @@ wsi_device_setup_syncobj_fd(struct wsi_device *wsi_device, ICD_DEFINE_NONDISP_HANDLE_CASTS(VkIcdSurfaceBase, VkSurfaceKHR) -VkResult -wsi_common_get_images(VkSwapchainKHR _swapchain, - uint32_t *pSwapchainImageCount, - VkImage *pSwapchainImages); - VkImage wsi_common_get_image(VkSwapchainKHR _swapchain, uint32_t index);