venus: fix leaks from tracked present src images

The cmd can be reset and freed during render pass recording as well.

Cc: mesa-stable
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24009>
(cherry picked from commit fe4cf26687)
This commit is contained in:
Yiwei Zhang 2023-07-04 16:17:47 -07:00 committed by Eric Engestrom
parent 032ed1f999
commit f36154ea23
2 changed files with 12 additions and 1 deletions

View file

@ -3055,7 +3055,7 @@
"description": "venus: fix leaks from tracked present src images",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

View file

@ -639,6 +639,9 @@ vn_DestroyCommandPool(VkDevice device,
vn_cs_encoder_fini(&cmd->cs);
vn_object_base_fini(&cmd->base);
if (cmd->builder.present_src_images)
vk_free(&cmd->allocator, cmd->builder.present_src_images);
if (cmd->builder.tmp.data)
vk_free(&cmd->allocator, cmd->builder.tmp.data);
@ -653,6 +656,11 @@ static void
vn_cmd_reset(struct vn_command_buffer *cmd)
{
vn_cs_encoder_reset(&cmd->cs);
if (cmd->builder.present_src_images) {
vk_free(&cmd->allocator, cmd->builder.present_src_images);
cmd->builder.present_src_images = NULL;
}
cmd->state = VN_COMMAND_BUFFER_STATE_INITIAL;
cmd->draw_cmd_batched = 0;
}
@ -764,6 +772,9 @@ vn_FreeCommandBuffers(VkDevice device,
if (cmd->builder.tmp.data)
vk_free(alloc, cmd->builder.tmp.data);
if (cmd->builder.present_src_images)
vk_free(&cmd->allocator, cmd->builder.present_src_images);
vn_cs_encoder_fini(&cmd->cs);
list_del(&cmd->head);