summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2022-08-02 08:18:34 -0400
committerMarge Bot <emma+marge@anholt.net>2022-08-03 12:24:46 +0000
commite13c9d2168dfb216a4920e84d89dbcc08de3dfe0 (patch)
tree602f7c4c3003572aabba1ee64424d0b73e10ee64
parent7450990558965a38513ce94fbed9a593f8403a98 (diff)
downloadmesa-e13c9d2168dfb216a4920e84d89dbcc08de3dfe0.tar.gz
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 <airlied@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17866>
-rw-r--r--src/gallium/drivers/zink/zink_descriptors_lazy.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gallium/drivers/zink/zink_descriptors_lazy.c b/src/gallium/drivers/zink/zink_descriptors_lazy.c
index 24c05a89a95..2d02d33c3ea 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);
}