Mesa (master): radv: destroy the base object if VkCreateRenderPass*() failed

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 2e5968023f7ffb44524958cf40ef8665b70af681
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e5968023f7ffb44524958cf40ef8665b70af681

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Jul 10 16:04:26 2020 +0200

radv: destroy the base object if VkCreateRenderPass*() failed

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

---

 src/amd/vulkan/radv_pass.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c
index 0c1ab154cb6..e3606adbcd5 100644
--- a/src/amd/vulkan/radv_pass.c
+++ b/src/amd/vulkan/radv_pass.c
@@ -300,6 +300,16 @@ radv_num_subpass_attachments(const VkSubpassDescription *desc)
 	       (desc->pDepthStencilAttachment != NULL);
 }
 
+static void
+radv_destroy_render_pass(struct radv_device *device,
+			 const VkAllocationCallbacks *pAllocator,
+			 struct radv_render_pass *pass)
+{
+	vk_object_base_finish(&pass->base);
+	vk_free2(&device->vk.alloc, pAllocator, pass->subpass_attachments);
+	vk_free2(&device->vk.alloc, pAllocator, pass);
+}
+
 VkResult radv_CreateRenderPass(
 	VkDevice                                    _device,
 	const VkRenderPassCreateInfo*               pCreateInfo,
@@ -370,7 +380,7 @@ VkResult radv_CreateRenderPass(
 				    subpass_attachment_count * sizeof(struct radv_subpass_attachment), 8,
 				    VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 		if (pass->subpass_attachments == NULL) {
-			vk_free2(&device->vk.alloc, pAllocator, pass);
+			radv_destroy_render_pass(device, pAllocator, pass);
 			return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
 		}
 	} else
@@ -553,7 +563,7 @@ VkResult radv_CreateRenderPass2(
 				    subpass_attachment_count * sizeof(struct radv_subpass_attachment), 8,
 				    VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 		if (pass->subpass_attachments == NULL) {
-			vk_free2(&device->vk.alloc, pAllocator, pass);
+			radv_destroy_render_pass(device, pAllocator, pass);
 			return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
 		}
 	} else
@@ -690,9 +700,7 @@ void radv_DestroyRenderPass(
 	if (!_pass)
 		return;
 
-	vk_object_base_finish(&pass->base);
-	vk_free2(&device->vk.alloc, pAllocator, pass->subpass_attachments);
-	vk_free2(&device->vk.alloc, pAllocator, pass);
+	radv_destroy_render_pass(device, pAllocator, pass);
 }
 
 void radv_GetRenderAreaGranularity(