diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index 8823117ea1a..16dbeb1af1d 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -1915,7 +1915,6 @@ x11_swapchain_destroy(struct wsi_swapchain *anv_chain,
 
    for (uint32_t i = 0; i < chain->base.image_count; i++)
       x11_image_finish(chain, pAllocator, &chain->images[i]);
-   wsi_destroy_image_info(&chain->base, &chain->base.image_info);
 
    xcb_unregister_for_special_event(chain->conn, chain->special_event);
    cookie = xcb_present_select_input_checked(chain->conn, chain->event_id,
@@ -2021,17 +2020,40 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
    if (chain == NULL)
       return VK_ERROR_OUT_OF_HOST_MEMORY;
 
-   /* When our local device is not compatible with the DRI3 device provided by
-    * the X server we assume this is a PRIME system.
-    */
-   bool use_buffer_blit = false;
-   if (!wsi_device->sw)
-      if (!wsi_x11_check_dri3_compatible(wsi_device, conn))
-         use_buffer_blit = true;
+   struct wsi_base_image_params *image_params = NULL;
+   struct wsi_cpu_image_params cpu_image_params;
+   struct wsi_drm_image_params drm_image_params;
+   uint64_t *modifiers[2] = {NULL, NULL};
+   uint32_t num_modifiers[2] = {0, 0};
+   if (wsi_device->sw) {
+      cpu_image_params = (struct wsi_cpu_image_params) {
+         .base.image_type = WSI_IMAGE_TYPE_CPU,
+         .alloc_shm = wsi_conn->has_mit_shm ? &alloc_shm : NULL,
+      };
+      image_params = &cpu_image_params.base;
+   } else {
+      drm_image_params = (struct wsi_drm_image_params) {
+         .base.image_type = WSI_IMAGE_TYPE_DRM,
+         .same_gpu = wsi_x11_check_dri3_compatible(wsi_device, conn),
+      };
+      if (wsi_device->supports_modifiers) {
+         wsi_x11_get_dri3_modifiers(wsi_conn, conn, window, bit_depth, 32,
+                                    pCreateInfo->compositeAlpha,
+                                    modifiers, num_modifiers,
+                                    &drm_image_params.num_modifier_lists,
+                                    pAllocator);
+         drm_image_params.num_modifiers = num_modifiers;
+         drm_image_params.modifiers = (const uint64_t **)modifiers;
+      }
+      image_params = &drm_image_params.base;
+   }
+
+   result = wsi_swapchain_init(wsi_device, &chain->base, device, pCreateInfo,
+                               image_params, pAllocator, false);
+
+   for (int i = 0; i < ARRAY_SIZE(modifiers); i++)
+      vk_free(pAllocator, modifiers[i]);
 
-   result = wsi_swapchain_init(wsi_device, &chain->base, device,
-                               pCreateInfo, NULL, pAllocator,
-                               use_buffer_blit);
    if (result != VK_SUCCESS)
       goto fail_alloc;
 
@@ -2115,33 +2137,6 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
                           (uint32_t []) { 0 });
    xcb_discard_reply(chain->conn, cookie.sequence);
 
-   uint64_t *modifiers[2] = {NULL, NULL};
-   uint32_t num_modifiers[2] = {0, 0};
-   uint32_t num_tranches = 0;
-   if (wsi_device->supports_modifiers)
-      wsi_x11_get_dri3_modifiers(wsi_conn, conn, window, chain->depth, 32,
-                                 pCreateInfo->compositeAlpha,
-                                 modifiers, num_modifiers, &num_tranches,
-                                 pAllocator);
-
-   if (wsi_device->sw) {
-      result = wsi_configure_cpu_image(&chain->base, pCreateInfo,
-                                       chain->has_mit_shm ? &alloc_shm : NULL,
-                                       &chain->base.image_info);
-   } else if (chain->base.use_buffer_blit) {
-      bool use_modifier = num_tranches > 0;
-      result = wsi_configure_prime_image(&chain->base, pCreateInfo,
-                                         use_modifier,
-                                         &chain->base.image_info);
-   } else {
-      result = wsi_configure_native_image(&chain->base, pCreateInfo,
-                                          num_tranches, num_modifiers,
-                                          (const uint64_t *const *)modifiers,
-                                          &chain->base.image_info);
-   }
-   if (result != VK_SUCCESS)
-      goto fail_modifiers;
-
    uint32_t image = 0;
    for (; image < chain->base.image_count; image++) {
       result = x11_image_init(device, chain, pCreateInfo, pAllocator,
@@ -2222,12 +2217,6 @@ fail_init_images:
    for (uint32_t j = 0; j < image; j++)
       x11_image_finish(chain, pAllocator, &chain->images[j]);
 
-   wsi_destroy_image_info(&chain->base, &chain->base.image_info);
-
-fail_modifiers:
-   for (int i = 0; i < ARRAY_SIZE(modifiers); i++)
-      vk_free(pAllocator, modifiers[i]);
-
 fail_register:
    xcb_unregister_for_special_event(chain->conn, chain->special_event);