From ae80f9ce65d46c0680d2c5b4e60f3b9a9f879a8b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 21 Feb 2024 16:30:15 -0500 Subject: [PATCH] zink: make kopper_swapchain_image::acquired the resource that acquired it no functional changes Part-of: --- src/gallium/drivers/zink/zink_kopper.c | 6 +++--- src/gallium/drivers/zink/zink_kopper.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c index cfb45835da8..a61720b18e0 100644 --- a/src/gallium/drivers/zink/zink_kopper.c +++ b/src/gallium/drivers/zink/zink_kopper.c @@ -563,7 +563,7 @@ kopper_acquire(struct zink_screen *screen, struct zink_resource *res, uint64_t t res->obj->image = cdt->swapchain->images[res->obj->dt_idx].image; if (!cdt->age_locked) zink_kopper_update_last_written(res); - cdt->swapchain->images[res->obj->dt_idx].acquired = false; + cdt->swapchain->images[res->obj->dt_idx].acquired = NULL; if (!cdt->swapchain->images[res->obj->dt_idx].init) { /* swapchain images are initially in the UNDEFINED layout */ res->layout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -644,7 +644,7 @@ zink_kopper_acquire_submit(struct zink_screen *screen, struct zink_resource *res return VK_NULL_HANDLE; } assert(cdt->swapchain->images[res->obj->dt_idx].acquire); - cdt->swapchain->images[res->obj->dt_idx].acquired = true; + cdt->swapchain->images[res->obj->dt_idx].acquired = res; /* this is now owned by the batch */ VkSemaphore acquire = cdt->swapchain->images[res->obj->dt_idx].acquire; cdt->swapchain->images[res->obj->dt_idx].acquire = VK_NULL_HANDLE; @@ -832,7 +832,7 @@ zink_kopper_present_queue(struct zink_screen *screen, struct zink_resource *res) kopper_present(cpi, screen, -1); } res->obj->indefinite_acquire = false; - cdt->swapchain->images[res->obj->dt_idx].acquired = false; + cdt->swapchain->images[res->obj->dt_idx].acquired = NULL; res->obj->dt_idx = UINT32_MAX; } diff --git a/src/gallium/drivers/zink/zink_kopper.h b/src/gallium/drivers/zink/zink_kopper.h index 2ebf9f3b212..d63dcdb0629 100644 --- a/src/gallium/drivers/zink/zink_kopper.h +++ b/src/gallium/drivers/zink/zink_kopper.h @@ -41,10 +41,10 @@ struct zink_batch_usage; struct kopper_swapchain_image { bool init; - bool acquired; bool dt_has_data; int age; VkImage image; + struct zink_resource *acquired; struct pipe_resource *readback; VkSemaphore acquire; VkImageLayout layout;