radv: destroy the base object if VkCreateEvent() failed
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Fri, 10 Jul 2020 15:14:30 +0000 (17:14 +0200)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Wed, 15 Jul 2020 11:53:29 +0000 (13:53 +0200)
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_device.c

index f449199d9943834613a4aec762256afd1c98eb00..6594b2a00d98237a948a5f446b612c4263a4cbe2 100644 (file)
@@ -5800,7 +5800,9 @@ static void radv_destroy_event(struct radv_device *device,
                                const VkAllocationCallbacks* pAllocator,
                                struct radv_event *event)
 {
-       device->ws->buffer_destroy(event->bo);
+       if (event->bo)
+               device->ws->buffer_destroy(event->bo);
+
        vk_object_base_finish(&event->base);
        vk_free2(&device->vk.alloc, pAllocator, event);
 }
@@ -5826,7 +5828,7 @@ VkResult radv_CreateEvent(
                                              RADEON_FLAG_VA_UNCACHED | RADEON_FLAG_CPU_ACCESS | RADEON_FLAG_NO_INTERPROCESS_SHARING,
                                              RADV_BO_PRIORITY_FENCE);
        if (!event->bo) {
-               vk_free2(&device->vk.alloc, pAllocator, event);
+               radv_destroy_event(device, pAllocator, event);
                return vk_error(device->instance, VK_ERROR_OUT_OF_DEVICE_MEMORY);
        }