Mesa (main): radv: fix vk_object_base_init/finish for the internal push descriptors

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 16378837db810bbb6b4923ac1016f4ccb43a1a7f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=16378837db810bbb6b4923ac1016f4ccb43a1a7f

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Sep 29 09:44:36 2021 +0200

radv: fix vk_object_base_init/finish for the internal push descriptors

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13102>

---

 src/amd/vulkan/radv_cmd_buffer.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 4bc7ebf37d0..ac745683f00 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -408,6 +408,8 @@ radv_destroy_cmd_buffer(struct radv_cmd_buffer *cmd_buffer)
    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->meta_push_descriptors.base);
+
    vk_command_buffer_finish(&cmd_buffer->vk);
    vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
 }
@@ -444,6 +446,9 @@ radv_create_cmd_buffer(struct radv_device *device, struct radv_cmd_pool *pool,
       return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
    }
 
+   vk_object_base_init(&device->vk, &cmd_buffer->meta_push_descriptors.base,
+                       VK_OBJECT_TYPE_DESCRIPTOR_SET);
+
    *pCommandBuffer = radv_cmd_buffer_to_handle(cmd_buffer);
 
    list_inithead(&cmd_buffer->upload.list);