From 4c79ec1934b6dea74eebb74942d06d4891c55987 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@collabora.com>
Date: Wed, 6 Jul 2022 16:48:53 -0500
Subject: [PATCH] vulkan/wsi/wayland: Use wsi_configure_cpu_image

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17388>
---
 src/vulkan/wsi/wsi_common_wayland.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
index fcdf7c77ae5..3b744f26999 100644
--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -1314,12 +1314,18 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
 
    chain->fifo_ready = true;
 
-   result = wsi_configure_native_image(&chain->base, pCreateInfo,
-                                       chain->num_drm_modifiers > 0 ? 1 : 0,
-                                       &chain->num_drm_modifiers,
-                                       &chain->drm_modifiers,
+   if (wsi_device->sw) {
+      result = wsi_configure_cpu_image(&chain->base, pCreateInfo,
                                        NULL /* alloc_shm */,
                                        &chain->base.image_info);
+   } else {
+      result = wsi_configure_native_image(&chain->base, pCreateInfo,
+                                          chain->num_drm_modifiers > 0 ? 1 : 0,
+                                          &chain->num_drm_modifiers,
+                                          &chain->drm_modifiers,
+                                          NULL /* alloc_shm */,
+                                          &chain->base.image_info);
+   }
    if (result != VK_SUCCESS)
       goto fail;