From e13c9d2168dfb216a4920e84d89dbcc08de3dfe0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 2 Aug 2022 08:18:34 -0400 Subject: [PATCH] zink: combine loops for lazy descriptor program deinit the bindless and push sets don't have update templates stored to the program, so merging these loops avoids trying to destroy them cc: mesa-stable Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_descriptors_lazy.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_descriptors_lazy.c b/src/gallium/drivers/zink/zink_descriptors_lazy.c index 24c05a8..2d02d33 100644 --- a/src/gallium/drivers/zink/zink_descriptors_lazy.c +++ b/src/gallium/drivers/zink/zink_descriptors_lazy.c @@ -359,8 +359,6 @@ zink_descriptor_program_deinit_lazy(struct zink_context *ctx, struct zink_progra for (unsigned i = 0; pg->num_dsl && i < ZINK_DESCRIPTOR_TYPES; i++) { if (pg->dd->pool_key[i]) pg->dd->pool_key[i]->use_count--; - } - for (unsigned i = 0; i < pg->num_dsl; i++) { if (pg->dd->templates[i]) VKSCR(DestroyDescriptorUpdateTemplate)(screen->dev, pg->dd->templates[i], NULL); } -- 2.7.4