commit 50fdefc025a57b25c5bf55d9876e8032b358c3b2
author Samuel Pitoiset <samuel.pitoiset@gmail.com> Sun Jul 12 13:34:39 2020 +0200
committer Samuel Pitoiset <samuel.pitoiset@gmail.com> Wed Jul 15 13:53:35 2020 +0200
tree 96addbc6c3792549f8df379da2950e4cb7ee17ba
parent e5f2bf369724d57bf1ca57ef9a466fb9934f2255

radv: destroy the base object if VkAllocateCommandBuffers() failed

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5868>

src/amd/vulkan/radv_cmd_buffer.c

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index bfae582..92556e3 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -336,6 +336,31 @@
 	}
 }
 
+static void
+radv_destroy_cmd_buffer(struct radv_cmd_buffer *cmd_buffer)
+{
+	list_del(&cmd_buffer->pool_link);
+
+	list_for_each_entry_safe(struct radv_cmd_buffer_upload, up,
+				 &cmd_buffer->upload.list, list) {
+		cmd_buffer->device->ws->buffer_destroy(up->upload_bo);
+		list_del(&up->list);
+		free(up);
+	}
+
+	if (cmd_buffer->upload.upload_bo)
+		cmd_buffer->device->ws->buffer_destroy(cmd_buffer->upload.upload_bo);
+
+	if (cmd_buffer->cs)
+		cmd_buffer->device->ws->cs_destroy(cmd_buffer->cs);
+
+	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->base);
+	vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
+}
+
 static VkResult radv_create_cmd_buffer(
 	struct radv_device *                         device,
 	struct radv_cmd_pool *                       pool,
@@ -363,7 +388,7 @@
 
 	cmd_buffer->cs = device->ws->cs_create(device->ws, ring);
 	if (!cmd_buffer->cs) {
-		vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
+		radv_destroy_cmd_buffer(cmd_buffer);
 		return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
 	}
 
@@ -374,30 +399,6 @@
 	return VK_SUCCESS;
 }
 
-static void
-radv_cmd_buffer_destroy(struct radv_cmd_buffer *cmd_buffer)
-{
-	list_del(&cmd_buffer->pool_link);
-
-	list_for_each_entry_safe(struct radv_cmd_buffer_upload, up,
-				 &cmd_buffer->upload.list, list) {
-		cmd_buffer->device->ws->buffer_destroy(up->upload_bo);
-		list_del(&up->list);
-		free(up);
-	}
-
-	if (cmd_buffer->upload.upload_bo)
-		cmd_buffer->device->ws->buffer_destroy(cmd_buffer->upload.upload_bo);
-	cmd_buffer->device->ws->cs_destroy(cmd_buffer->cs);
-
-	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->base);
-
-	vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
-}
-
 static VkResult
 radv_reset_cmd_buffer(struct radv_cmd_buffer *cmd_buffer)
 {
@@ -3628,7 +3629,7 @@
 				list_del(&cmd_buffer->pool_link);
 				list_addtail(&cmd_buffer->pool_link, &cmd_buffer->pool->free_cmd_buffers);
 			} else
-				radv_cmd_buffer_destroy(cmd_buffer);
+				radv_destroy_cmd_buffer(cmd_buffer);
 
 		}
 	}
@@ -4767,12 +4768,12 @@
 
 	list_for_each_entry_safe(struct radv_cmd_buffer, cmd_buffer,
 				 &pool->cmd_buffers, pool_link) {
-		radv_cmd_buffer_destroy(cmd_buffer);
+		radv_destroy_cmd_buffer(cmd_buffer);
 	}
 
 	list_for_each_entry_safe(struct radv_cmd_buffer, cmd_buffer,
 				 &pool->free_cmd_buffers, pool_link) {
-		radv_cmd_buffer_destroy(cmd_buffer);
+		radv_destroy_cmd_buffer(cmd_buffer);
 	}
 
 	vk_object_base_finish(&pool->base);
@@ -4809,7 +4810,7 @@
 
 	list_for_each_entry_safe(struct radv_cmd_buffer, cmd_buffer,
 				 &pool->free_cmd_buffers, pool_link) {
-		radv_cmd_buffer_destroy(cmd_buffer);
+		radv_destroy_cmd_buffer(cmd_buffer);
 	}
 }