From cdd1ce140d2e77e68b64666718c472a86860fdbe Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 13 Feb 2024 14:12:51 -0500 Subject: [PATCH] zink: make zink_kopper_present_info public no functional changes Part-of: --- src/gallium/drivers/zink/zink_kopper.c | 13 ++----------- src/gallium/drivers/zink/zink_kopper.h | 9 +++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c index cc1d93aa05a..71b2bb44902 100644 --- a/src/gallium/drivers/zink/zink_kopper.c +++ b/src/gallium/drivers/zink/zink_kopper.c @@ -662,19 +662,10 @@ zink_kopper_present(struct zink_screen *screen, struct zink_resource *res) return res->obj->present; } -struct kopper_present_info { - VkPresentInfoKHR info; - uint32_t image; - struct kopper_swapchain *swapchain; - struct zink_resource *res; - VkSemaphore sem; - bool indefinite_acquire; -}; - static void kopper_present(void *data, void *gdata, int thread_idx) { - struct kopper_present_info *cpi = data; + struct zink_kopper_present_info *cpi = data; struct kopper_displaytarget *cdt = cpi->res->obj->dt; struct kopper_swapchain *swapchain = cpi->swapchain; struct zink_screen *screen = gdata; @@ -784,7 +775,7 @@ zink_kopper_present_queue(struct zink_screen *screen, struct zink_resource *res) if (cdt->swapchain->last_present != UINT32_MAX) prune_old_swapchains(screen, cdt, false); - struct kopper_present_info *cpi = malloc(sizeof(struct kopper_present_info)); + struct zink_kopper_present_info *cpi = malloc(sizeof(struct zink_kopper_present_info)); if (!cpi) { mesa_loge("ZINK: failed to allocate cpi!"); return; diff --git a/src/gallium/drivers/zink/zink_kopper.h b/src/gallium/drivers/zink/zink_kopper.h index 698eafab44f..35d0e932efd 100644 --- a/src/gallium/drivers/zink/zink_kopper.h +++ b/src/gallium/drivers/zink/zink_kopper.h @@ -100,6 +100,15 @@ struct kopper_displaytarget bool age_locked; //disables buffer age during readback }; +struct zink_kopper_present_info { + VkPresentInfoKHR info; + uint32_t image; + struct kopper_swapchain *swapchain; + struct zink_resource *res; + VkSemaphore sem; + bool indefinite_acquire; +}; + struct zink_context; struct zink_screen; struct zink_resource;