Mesa (main): zink: fix cached descriptor allocation clamping

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jul 22 01:42:17 UTC 2021


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 21 16:45:41 2021 -0400

zink: fix cached descriptor allocation clamping

the number of allocated sets should be directly compared to the maximum

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

---

 src/gallium/drivers/zink/zink_descriptors.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c
index 7c312e5c126..c20c3325713 100644
--- a/src/gallium/drivers/zink/zink_descriptors.c
+++ b/src/gallium/drivers/zink/zink_descriptors.c
@@ -806,7 +806,7 @@ skip_hash_tables:
       }
    }
 
-   if (pool->num_sets_allocated + pool->key.layout->num_descriptors > ZINK_DEFAULT_MAX_DESCS) {
+   if (pool->num_sets_allocated == ZINK_DEFAULT_MAX_DESCS) {
       simple_mtx_unlock(&pool->mtx);
       zink_fence_wait(&ctx->base);
       zink_batch_reference_program(batch, pg);



More information about the mesa-commit mailing list