Re: [Mesa-dev] [PATCH v2 23/32] vulkan/wsi: Move get_images into common code

[Chad Versace]

On Tue 28 Nov 2017, Jason Ekstrand wrote:
> This moves bits out of all four corners (anv, radv, x11, wayland) and
> into the wsi common code.  We also switch to using an outarray to ensure
> we get our return code right.
> ---
>  src/amd/vulkan/radv_wsi.c   |  7 +++
>  src/intel/vulkan/anv_wsi.c  |  7 +++
>  src/vulkan/wsi/wsi_common.c | 17 +
>  src/vulkan/wsi/wsi_common.h |  9 +++--
>  src/vulkan/wsi/wsi_common_wayland.c | 28 +---
>  src/vulkan/wsi/wsi_common_x11.c | 29 +
>  6 files changed, 40 insertions(+), 57 deletions(-)

Patches 22 and 23 are
Reviewed-by: Chad Versace 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH v2 23/32] vulkan/wsi: Move get_images into common code

[Jason Ekstrand]

This moves bits out of all four corners (anv, radv, x11, wayland) and
into the wsi common code.  We also switch to using an outarray to ensure
we get our return code right.
---
 src/amd/vulkan/radv_wsi.c   |  7 +++
 src/intel/vulkan/anv_wsi.c  |  7 +++
 src/vulkan/wsi/wsi_common.c | 17 +
 src/vulkan/wsi/wsi_common.h |  9 +++--
 src/vulkan/wsi/wsi_common_wayland.c | 28 +---
 src/vulkan/wsi/wsi_common_x11.c | 29 +
 6 files changed, 40 insertions(+), 57 deletions(-)

diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c
index 0d1b479..ed964c5 100644
--- a/src/amd/vulkan/radv_wsi.c
+++ b/src/amd/vulkan/radv_wsi.c
@@ -222,13 +222,12 @@ void radv_DestroySwapchainKHR(
 
 VkResult radv_GetSwapchainImagesKHR(
VkDevice device,
-   VkSwapchainKHR   _swapchain,
+   VkSwapchainKHR   swapchain,
uint32_t*pSwapchainImageCount,
VkImage* pSwapchainImages)
 {
-   RADV_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain);
-
-   return swapchain->get_images(swapchain, pSwapchainImageCount,
+   return wsi_common_get_images(swapchain,
+pSwapchainImageCount,
 pSwapchainImages);
 }
 
diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c
index 975ad18..eed378c 100644
--- a/src/intel/vulkan/anv_wsi.c
+++ b/src/intel/vulkan/anv_wsi.c
@@ -248,13 +248,12 @@ void anv_DestroySwapchainKHR(
 
 VkResult anv_GetSwapchainImagesKHR(
 VkDevice device,
-VkSwapchainKHR   _swapchain,
+VkSwapchainKHR   swapchain,
 uint32_t*pSwapchainImageCount,
 VkImage* pSwapchainImages)
 {
-   ANV_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain);
-
-   return swapchain->get_images(swapchain, pSwapchainImageCount,
+   return wsi_common_get_images(swapchain,
+pSwapchainImageCount,
 pSwapchainImages);
 }
 
diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c
index e5a9a28..ea4920c 100644
--- a/src/vulkan/wsi/wsi_common.c
+++ b/src/vulkan/wsi/wsi_common.c
@@ -508,6 +508,23 @@ wsi_prime_image_blit_to_linear(const struct wsi_swapchain 
*chain,
 }
 
 VkResult
+wsi_common_get_images(VkSwapchainKHR _swapchain,
+  uint32_t *pSwapchainImageCount,
+  VkImage *pSwapchainImages)
+{
+   WSI_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain);
+   VK_OUTARRAY_MAKE(images, pSwapchainImages, pSwapchainImageCount);
+
+   for (uint32_t i = 0; i < swapchain->image_count; i++) {
+  vk_outarray_append(, image) {
+ *image = swapchain->get_wsi_image(swapchain, i)->image;
+  }
+   }
+
+   return vk_outarray_status();
+}
+
+VkResult
 wsi_common_queue_present(const struct wsi_device *wsi,
  VkDevice device,
  VkQueue queue,
diff --git a/src/vulkan/wsi/wsi_common.h b/src/vulkan/wsi/wsi_common.h
index b47da43..892e708 100644
--- a/src/vulkan/wsi/wsi_common.h
+++ b/src/vulkan/wsi/wsi_common.h
@@ -64,8 +64,8 @@ struct wsi_swapchain {
 
VkResult (*destroy)(struct wsi_swapchain *swapchain,
const VkAllocationCallbacks *pAllocator);
-   VkResult (*get_images)(struct wsi_swapchain *swapchain,
-  uint32_t *pCount, VkImage *pSwapchainImages);
+   struct wsi_image *(*get_wsi_image)(struct wsi_swapchain *swapchain,
+  uint32_t image_index);
VkResult (*acquire_next_image)(struct wsi_swapchain *swap_chain,
   uint64_t timeout, VkSemaphore semaphore,
   uint32_t *image_index);
@@ -217,6 +217,11 @@ void wsi_wl_finish_wsi(struct wsi_device *wsi_device,
const VkAllocationCallbacks *alloc);
 
 VkResult
+wsi_common_get_images(VkSwapchainKHR _swapchain,
+  uint32_t *pSwapchainImageCount,
+  VkImage *pSwapchainImages);
+
+VkResult
 wsi_common_queue_present(const struct wsi_device *wsi,
  VkDevice device_h,
  VkQueue queue_h,
diff --git a/src/vulkan/wsi/wsi_common_wayland.c 
b/src/vulkan/wsi/wsi_common_wayland.c
index 22c01b2..bf60a9b 100644
--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -582,30 +582,12 @@ struct wsi_wl_swapchain {
struct wsi_wl_image  images[0];
 };
 
-static VkResult
-wsi_wl_swapchain_get_images(struct wsi_swapchain *wsi_chain,
-uint32_t *pCount, VkImage