From f57f28a348577cdacf1e371ba22e85ac8892a041 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 10 Feb 2023 15:32:46 -0500 Subject: [PATCH] zink: move zink_batch_state::db_bound reset to zink_batch_descriptor_reset() descriptor code goes in descriptor file Part-of: --- src/gallium/drivers/zink/zink_batch.c | 1 - src/gallium/drivers/zink/zink_descriptors.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c index 7d7eed3988f..98fb7d6d975 100644 --- a/src/gallium/drivers/zink/zink_batch.c +++ b/src/gallium/drivers/zink/zink_batch.c @@ -155,7 +155,6 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs) */ bs->fence.submitted = false; bs->has_barriers = false; - bs->db_bound = false; if (bs->fence.batch_id) zink_screen_update_last_finished(screen, bs->fence.batch_id); bs->submit_count++; diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index ea8a60511af..aad10cbfd23 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -1449,6 +1449,7 @@ zink_batch_descriptor_reset(struct zink_screen *screen, struct zink_batch_state { if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB) { bs->dd.db_offset = 0; + bs->db_bound = false; } else { for (unsigned i = 0; i < ZINK_DESCRIPTOR_BASE_TYPES; i++) { struct zink_descriptor_pool_multi **mpools = bs->dd.pools[i].data;