mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

zink: Always call deinit_multi_pool_overflow when destroying zink_descriptor_pool_multi 

Make sure to never leak any vkDescriptorPool as the zink_descriptor_pool_multi might
get released before the overflow array get emptied.

Found with the validation layer and piglit
`spec@glsl-1.30@execution@tex-miplevel-selection texturegradoffset 1darray`

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29018>
This commit is contained in:
Corentin Noël 2024-05-02 11:43:31 +02:00 committed by Marge Bot
parent d4084f7f09
commit b69189a279
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/gallium/drivers/zink/zink_descriptors.c
View File

@ -795,14 +795,6 @@ pool_destroy(struct zink_screen *screen, struct zink_descriptor_pool *pool)
FREE(pool);
}
static void
multi_pool_destroy(struct zink_screen *screen, struct zink_descriptor_pool_multi *mpool)
{
if (mpool->pool)
pool_destroy(screen, mpool->pool);
FREE(mpool);
}
static bool
clear_multi_pool_overflow(struct zink_screen *screen, struct util_dynarray *overflowed_pools)
{
@ -815,6 +807,24 @@ clear_multi_pool_overflow(struct zink_screen *screen, struct util_dynarray *over
return found;
}
static void
deinit_multi_pool_overflow(struct zink_screen *screen, struct zink_descriptor_pool_multi *mpool)
{
for (unsigned i = 0; i < 2; i++) {
clear_multi_pool_overflow(screen, &mpool->overflowed_pools[i]);
util_dynarray_fini(&mpool->overflowed_pools[i]);
}
}
static void
multi_pool_destroy(struct zink_screen *screen, struct zink_descriptor_pool_multi *mpool)
{
deinit_multi_pool_overflow(screen, mpool);
if (mpool->pool)
pool_destroy(screen, mpool->pool);
FREE(mpool);
}
static VkDescriptorPool
create_pool(struct zink_screen *screen, unsigned num_type_sizes, const VkDescriptorPoolSize *sizes, unsigned flags)
{
@ -1477,15 +1487,6 @@ zink_context_invalidate_descriptor_state_compact(struct zink_context *ctx, gl_sh
}
}
static void
deinit_multi_pool_overflow(struct zink_screen *screen, struct zink_descriptor_pool_multi *mpool)
{
for (unsigned i = 0; i < 2; i++) {
clear_multi_pool_overflow(screen, &mpool->overflowed_pools[i]);
util_dynarray_fini(&mpool->overflowed_pools[i]);
}
}
/* called during batch state destroy */
void
zink_batch_descriptor_deinit(struct zink_screen *screen, struct zink_batch_state *bs)
@ -1493,10 +1494,8 @@ zink_batch_descriptor_deinit(struct zink_screen *screen, struct zink_batch_state
for (unsigned i = 0; i < ZINK_DESCRIPTOR_BASE_TYPES; i++) {
for (unsigned j = 0; j < bs->dd.pools[i].capacity / sizeof(struct zink_descriptor_pool_multi *); j++) {
struct zink_descriptor_pool_multi **mppool = util_dynarray_element(&bs->dd.pools[i], struct zink_descriptor_pool_multi *, j);
if (mppool && *mppool) {
deinit_multi_pool_overflow(screen, *mppool);
if (mppool && *mppool)
multi_pool_destroy(screen, *mppool);
}
}
util_dynarray_fini(&bs->dd.pools[i]);
}