From 3f51dad5bb8c1d122e0b57ce84db7b46df2ac662 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 2 Jul 2025 10:33:13 -0400
Subject: [PATCH] zink: use HIC image transitions to init swapchain images

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35896>
---
 src/gallium/drivers/zink/zink_kopper.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c
index 35233829f62..2032280c326 100644
--- a/src/gallium/drivers/zink/zink_kopper.c
+++ b/src/gallium/drivers/zink/zink_kopper.c
@@ -618,6 +618,10 @@ kopper_acquire(struct zink_screen *screen, struct zink_resource *res, uint64_t t
       /* swapchain images are initially in the UNDEFINED layout */
       res->layout = VK_IMAGE_LAYOUT_UNDEFINED;
       cdt->swapchain->images[res->obj->dt_idx].init = true;
+      if (screen->info.have_EXT_host_image_copy) {
+         VkImageLayout layout = screen->info.have_KHR_unified_image_layouts ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+         zink_resource_image_hic_transition(screen, res, layout);
+      }
    }
    if (timeout == UINT64_MAX) {
       res->obj->indefinite_acquire = true;