vulkan/wsi: Fix OOM behavior with prime images.
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tue, 6 Feb 2018 14:43:36 +0000 (15:43 +0100)
committerBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tue, 6 Feb 2018 20:52:39 +0000 (21:52 +0100)
Fixes: d50937f137 "vulkan/wsi: Implement prime in a completely generic way"
Reviewed-by: Dave Airlie <airlied@redhat.com>
src/vulkan/wsi/wsi_common.c

index e9e43e120482c0c66e3b6120867ad2c6a1a6a741..90ed07b7857a8dd331a0e95899ad572190eaeeda 100644 (file)
@@ -429,8 +429,10 @@ wsi_create_prime_image(const struct wsi_swapchain *chain,
       vk_zalloc(&chain->alloc,
                 sizeof(VkCommandBuffer) * wsi->queue_family_count, 8,
                 VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
-   if (!image->prime.blit_cmd_buffers)
+   if (!image->prime.blit_cmd_buffers) {
+      result = VK_ERROR_OUT_OF_HOST_MEMORY;
       goto fail;
+   }
 
    for (uint32_t i = 0; i < wsi->queue_family_count; i++) {
       const VkCommandBufferAllocateInfo cmd_buffer_info = {