Mesa (main): zink: remove zink_batch_state::descs_used

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: b85a6b9162ebd2b535eeac3bda446d721e7f633b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b85a6b9162ebd2b535eeac3bda446d721e7f633b

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May  7 09:31:45 2021 -0400

zink: remove zink_batch_state::descs_used

this is no longer used or needed

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11400>

---

 src/gallium/drivers/zink/zink_batch.c       | 1 -
 src/gallium/drivers/zink/zink_batch.h       | 2 --
 src/gallium/drivers/zink/zink_descriptors.c | 4 +---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c
index 03833cb7c06..f2d370ad8f0 100644
--- a/src/gallium/drivers/zink/zink_batch.c
+++ b/src/gallium/drivers/zink/zink_batch.c
@@ -82,7 +82,6 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
 
    bs->flush_res = NULL;
 
-   bs->descs_used = 0;
    ctx->resource_size -= bs->resource_size;
    bs->resource_size = 0;
 
diff --git a/src/gallium/drivers/zink/zink_batch.h b/src/gallium/drivers/zink/zink_batch.h
index 463e524a768..dc8ef09e9f1 100644
--- a/src/gallium/drivers/zink/zink_batch.h
+++ b/src/gallium/drivers/zink/zink_batch.h
@@ -69,8 +69,6 @@ struct zink_batch_state {
 
    struct zink_resource *flush_res;
 
-   unsigned short descs_used; //number of descriptors currently allocated
-
    struct set *fbs;
    struct set *programs;
 
diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c
index 089eccdefeb..7f8e5ce054c 100644
--- a/src/gallium/drivers/zink/zink_descriptors.c
+++ b/src/gallium/drivers/zink/zink_descriptors.c
@@ -813,9 +813,7 @@ out:
    _mesa_hash_table_insert_pre_hashed(pool->desc_sets, hash, &zds->key, zds);
 quick_out:
    zds->punted = zds->invalid = false;
-   if (batch_add_desc_set(batch, zds)) {
-      batch->state->descs_used += pool->key.layout->num_descriptors;
-   }
+   batch_add_desc_set(batch, zds);
    if (push_set)
       ctx->dd->last_set[is_compute] = zds;
    else