From 49d9a3605bc5b7b69a4549b4b6c57620a621d75d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 20 Jun 2022 21:46:21 -0400 Subject: [PATCH] zink: remove unnecessary code in kopper readback acquire this used to be important but no longer is, so modify the loop code to handle this case implicitly Reviewed-by: Adam Jackson Part-of: --- src/gallium/drivers/zink/zink_kopper.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c index bbec1c3..88ca980 100644 --- a/src/gallium/drivers/zink/zink_kopper.c +++ b/src/gallium/drivers/zink/zink_kopper.c @@ -735,18 +735,11 @@ zink_kopper_acquire_readback(struct zink_context *ctx, struct zink_resource *res const struct kopper_swapchain *cswap = cdt->swapchain; uint32_t last_dt_idx = res->obj->last_dt_idx; VkResult ret = VK_SUCCESS; - if (!res->obj->acquire) { - ret = kopper_acquire(screen, res, UINT64_MAX); - if (is_swapchain_kill(ret)) { - kill_swapchain(ctx, res); - return false; - } - } /* if this hasn't been presented or if it has data, use this as the readback target */ if (res->obj->last_dt_idx == UINT32_MAX || res->obj->dt_has_data) return false; while (res->obj->dt_idx != last_dt_idx) { - if (!zink_kopper_present_readback(ctx, res)) + if (res->obj->dt_idx != UINT32_MAX && !zink_kopper_present_readback(ctx, res)) break; do { ret = kopper_acquire(screen, res, 0); -- 2.7.4