vulkan: Handle descriptor set layout alloc fails
authorKonstantin Seurer <konstantin.seurer@gmail.com>
Sat, 30 Jul 2022 15:09:48 +0000 (17:09 +0200)
committerMarge Bot <emma+marge@anholt.net>
Tue, 2 Aug 2022 14:16:14 +0000 (14:16 +0000)
Fixes: 949ce92 ("vulkan: Add a base struct for descriptor set layouts")
Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17818>

src/vulkan/runtime/vk_descriptor_set_layout.c

index 5d50d55..f70302a 100644 (file)
@@ -46,6 +46,8 @@ vk_descriptor_set_layout_zalloc(struct vk_device *device, size_t size)
     */
    struct vk_descriptor_set_layout *layout =
       vk_zalloc(&device->alloc, size, 8, VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
+   if (!layout)
+      return NULL;
 
    vk_descriptor_set_layout_init(device, layout);
 
@@ -63,6 +65,8 @@ vk_descriptor_set_layout_multizalloc(struct vk_device *device,
    struct vk_descriptor_set_layout *layout =
       vk_multialloc_zalloc(ma, &device->alloc,
                            VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
+   if (!layout)
+      return NULL;
 
    vk_descriptor_set_layout_init(device, layout);