zink: free push descriptor pools on deinit

these are owned by the context, so destroy them when the context
requests destruction

cc: mesa-stable

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15173>
(cherry picked from commit 03a80490a4)
This commit is contained in:
Mike Blumenkrantz 2022-02-23 12:36:30 -05:00 committed by Dylan Baker
parent d45eaf087d
commit 65a55ea2a8
2 changed files with 3 additions and 1 deletions

View file

@ -2722,7 +2722,7 @@
"description": "zink: free push descriptor pools on deinit",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

View file

@ -1113,6 +1113,8 @@ zink_descriptor_pool_deinit(struct zink_context *ctx)
/* do not free: programs own these pools */
_mesa_hash_table_destroy(ctx->dd->descriptor_pools[i], NULL);
}
descriptor_pool_free(zink_screen(ctx->base.screen), ctx->dd->push_pool[0]);
descriptor_pool_free(zink_screen(ctx->base.screen), ctx->dd->push_pool[1]);
}
static bool