Mesa (main): zink: remove redundant asserts from lazy descriptor set populate

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Aug 18 20:57:40 UTC 2021


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 21 17:40:40 2021 -0400

zink: remove redundant asserts from lazy descriptor set populate

Reviewed-by: Hoe Hao Cheng <haochengho12907 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12427>

---

 src/gallium/drivers/zink/zink_descriptors_lazy.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_descriptors_lazy.c b/src/gallium/drivers/zink/zink_descriptors_lazy.c
index c3d965ce6b9..8b10b701d6d 100644
--- a/src/gallium/drivers/zink/zink_descriptors_lazy.c
+++ b/src/gallium/drivers/zink/zink_descriptors_lazy.c
@@ -414,15 +414,10 @@ populate_sets(struct zink_context *ctx, struct zink_program *pg, uint8_t *change
             return false;
    } else
       sets[0] = VK_NULL_HANDLE;
-   /* no flushing allowed */
-   assert(ctx->batch.state == bs);
-   bs = ctx->batch.state;
    u_foreach_bit(type, *changed_sets) {
       if (pg->dd->layout_key[type]) {
          struct zink_descriptor_pool *pool = get_descriptor_pool_lazy(ctx, pg, type, bs, pg->is_compute);
          sets[type + 1] = get_descriptor_set_lazy(pool);
-         /* no flushing allowed */
-         assert(ctx->batch.state == bs);
       } else
          sets[type + 1] = ctx->dd->dummy_set;
       if (!sets[type + 1])



More information about the mesa-commit mailing list