From b0bd0aac6ebd62e5f896f6199912e48ebed6241c Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 4 Oct 2021 13:10:07 +0200 Subject: [PATCH] radv: fix vk_object_base_init/finish for push descriptors Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index c2154d49b25..009f481d855 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -405,8 +405,10 @@ radv_destroy_cmd_buffer(struct radv_cmd_buffer *cmd_buffer) if (cmd_buffer->cs) cmd_buffer->device->ws->cs_destroy(cmd_buffer->cs); - for (unsigned i = 0; i < MAX_BIND_POINTS; i++) + for (unsigned i = 0; i < MAX_BIND_POINTS; i++) { free(cmd_buffer->descriptors[i].push_set.set.mapped_ptr); + vk_object_base_finish(&cmd_buffer->descriptors[i].push_set.set.base); + } vk_object_base_finish(&cmd_buffer->meta_push_descriptors.base); @@ -449,6 +451,10 @@ radv_create_cmd_buffer(struct radv_device *device, struct radv_cmd_pool *pool, vk_object_base_init(&device->vk, &cmd_buffer->meta_push_descriptors.base, VK_OBJECT_TYPE_DESCRIPTOR_SET); + for (unsigned i = 0; i < MAX_BIND_POINTS; i++) + vk_object_base_init(&device->vk, &cmd_buffer->descriptors[i].push_set.set.base, + VK_OBJECT_TYPE_DESCRIPTOR_SET); + *pCommandBuffer = radv_cmd_buffer_to_handle(cmd_buffer); list_inithead(&cmd_buffer->upload.list);