diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2020-07-10 17:25:00 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2020-07-15 13:53:30 +0200 |
| commit | d25764d91049753956264c5a9e52a774a45cd144 (patch) | |
| tree | 13b31bca18498fa86b34ff78aa312b732c2b18dc | |
| parent | ce7a7aeeccf44fa00fd8157b5e592c4980852f3b (diff) | |
radv: destroy the base object if VkCreateSemaphore() 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>
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 6594b2a00d9..89bb732d5f9 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -5628,6 +5628,17 @@ radv_get_semaphore_type(const void *pNext, uint64_t *initial_value) return type_info->semaphoreType; } +static void +radv_destroy_semaphore(struct radv_device *device, + const VkAllocationCallbacks *pAllocator, + struct radv_semaphore *sem) +{ + radv_destroy_semaphore_part(device, &sem->temporary); + radv_destroy_semaphore_part(device, &sem->permanent); + vk_object_base_finish(&sem->base); + vk_free2(&device->vk.alloc, pAllocator, sem); +} + VkResult radv_CreateSemaphore( VkDevice _device, const VkSemaphoreCreateInfo* pCreateInfo, @@ -5661,14 +5672,14 @@ VkResult radv_CreateSemaphore( assert (device->physical_device->rad_info.has_syncobj); int ret = device->ws->create_syncobj(device->ws, &sem->permanent.syncobj); if (ret) { - vk_free2(&device->vk.alloc, pAllocator, sem); + radv_destroy_semaphore(device, pAllocator, sem); return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY); } sem->permanent.kind = RADV_SEMAPHORE_SYNCOBJ; } else { sem->permanent.ws_sem = device->ws->create_sem(device->ws); if (!sem->permanent.ws_sem) { - vk_free2(&device->vk.alloc, pAllocator, sem); + radv_destroy_semaphore(device, pAllocator, sem); return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY); } sem->permanent.kind = RADV_SEMAPHORE_WINSYS; @@ -5688,10 +5699,7 @@ void radv_DestroySemaphore( if (!_semaphore) return; - radv_destroy_semaphore_part(device, &sem->temporary); - radv_destroy_semaphore_part(device, &sem->permanent); - vk_object_base_finish(&sem->base); - vk_free2(&device->vk.alloc, pAllocator, sem); + radv_destroy_semaphore(device, pAllocator, sem); } VkResult |