Module: Mesa Branch: main Commit: e1cf75b411759db0c49673b89b5325fb0442d547 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1cf75b411759db0c49673b89b5325fb0442d547
Author: Tatsuyuki Ishi <[email protected]> Date: Mon Nov 13 15:21:52 2023 +0900 zink: Remove now unused dead_framebuffers. These were deleted in fe8212791f1 ("zink: delete all non-imageless framebuffer code"). Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26168> --- src/gallium/drivers/zink/zink_batch.c | 9 --------- src/gallium/drivers/zink/zink_types.h | 1 - 2 files changed, 10 deletions(-) diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c index 823278ef988..ec6b730ab7e 100644 --- a/src/gallium/drivers/zink/zink_batch.c +++ b/src/gallium/drivers/zink/zink_batch.c @@ -128,13 +128,6 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs) VKSCR(DestroyIndirectCommandsLayoutNV)(screen->dev, *iclayout, NULL); util_dynarray_clear(&bs->dgc.layouts); - /* framebuffers are appended to the batch state in which they are destroyed - * to ensure deferred deletion without destroying in-use objects - */ - util_dynarray_foreach(&bs->dead_framebuffers, struct zink_framebuffer*, fb) { - zink_framebuffer_reference(screen, fb, NULL); - } - util_dynarray_clear(&bs->dead_framebuffers); /* samplers are appended to the batch state in which they are destroyed * to ensure deferred deletion without destroying in-use objects */ @@ -312,7 +305,6 @@ zink_batch_state_destroy(struct zink_screen *screen, struct zink_batch_state *bs util_dynarray_fini(&bs->dgc.layouts); util_dynarray_fini(&bs->swapchain_obj); util_dynarray_fini(&bs->zombie_samplers); - util_dynarray_fini(&bs->dead_framebuffers); util_dynarray_fini(&bs->unref_resources); util_dynarray_fini(&bs->bindless_releases[0]); util_dynarray_fini(&bs->bindless_releases[1]); @@ -404,7 +396,6 @@ create_batch_state(struct zink_context *ctx) util_dynarray_init(&bs->wait_semaphore_stages, NULL); util_dynarray_init(&bs->fd_wait_semaphore_stages, NULL); util_dynarray_init(&bs->zombie_samplers, NULL); - util_dynarray_init(&bs->dead_framebuffers, NULL); util_dynarray_init(&bs->freed_sparse_backing_bos, NULL); util_dynarray_init(&bs->unref_resources, NULL); util_dynarray_init(&bs->acquires, NULL); diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index 219561bfb8e..d58e61f9207 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -647,7 +647,6 @@ struct zink_batch_state { struct util_dynarray bindless_releases[2]; struct util_dynarray zombie_samplers; - struct util_dynarray dead_framebuffers; struct set active_queries; /* zink_query objects which were active at some point in this batch */ struct util_dynarray dead_querypools;
