From: Kristian Høgsberg Kristensen <krh@owl.jf.intel.com>
Date: Mon, 4 Jan 2016 06:42:01 +0000 (-0800)
Subject: vk: Handle allocation failure in anv_pipeline_init()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b2ad2a20b67645ac37b5f35daa47bfe454286d90;p=mesa.git

vk: Handle allocation failure in anv_pipeline_init()

Fixes dEQP-VK.api.object_management.alloc_callback_fail.* failures.
---

diff --git a/src/vulkan/anv_pipeline.c b/src/vulkan/anv_pipeline.c
index 12430f824ad..ad47f9661e4 100644
--- a/src/vulkan/anv_pipeline.c
+++ b/src/vulkan/anv_pipeline.c
@@ -950,6 +950,8 @@ anv_pipeline_init(struct anv_pipeline *pipeline, struct anv_device *device,
                   const struct anv_graphics_pipeline_create_info *extra,
                   const VkAllocationCallbacks *alloc)
 {
+   VkResult result;
+
    anv_validate {
       anv_pipeline_validate_create_info(pCreateInfo);
    }
@@ -960,8 +962,9 @@ anv_pipeline_init(struct anv_pipeline *pipeline, struct anv_device *device,
    pipeline->device = device;
    pipeline->layout = anv_pipeline_layout_from_handle(pCreateInfo->layout);
 
-   anv_reloc_list_init(&pipeline->batch_relocs, alloc);
-   /* TODO: Handle allocation fail */
+   result = anv_reloc_list_init(&pipeline->batch_relocs, alloc);
+   if (result != VK_SUCCESS)
+      return result;
 
    pipeline->batch.alloc = alloc;
    pipeline->batch.next = pipeline->batch.start = pipeline->batch_data;