Mesa (master): anv: set error in all failure paths

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: fcf259ef97fef9d52e7f82ef90fb2383438743b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcf259ef97fef9d52e7f82ef90fb2383438743b3

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Wed Aug  8 15:42:49 2018 +0100

anv: set error in all failure paths

Cc: Jason Ekstrand <jason.ekstrand at intel.com>
Fixes: 5b196f39bddc689742d3 "anv/pipeline: Compile to NIR in compile_graphics"
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 src/intel/vulkan/anv_pipeline.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 23af0f1c92..4074c8fd36 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -979,8 +979,10 @@ anv_pipeline_compile_graphics(struct anv_pipeline *pipeline,
                                            &stages[s],
                                            &stages[s].prog_data.base,
                                            &stages[s].bind_map);
-      if (stages[s].nir == NULL)
+      if (stages[s].nir == NULL) {
+         result = vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
          goto fail;
+      }
    }
 
    /* Walk backwards to link */