Mesa (master): zink: handle errors in nir_to_spirv

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Thu Feb  4 14:28:46 2021 +0100

zink: handle errors in nir_to_spirv

We already have some appropriate error-handling further down here.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9836>

---

 src/gallium/drivers/zink/zink_compiler.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 09d90dee267..fbbe66e99a7 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -506,7 +506,8 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, struct z
    }
    NIR_PASS_V(nir, nir_convert_from_ssa, true);
    struct spirv_shader *spirv = nir_to_spirv(nir, streamout, shader_slot_map, shader_slots_reserved);
-   assert(spirv);
+   if (!spirv)
+      goto done;
 
    if (zink_debug & ZINK_DEBUG_SPIRV) {
       char buf[256];
@@ -528,6 +529,7 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, struct z
    if (vkCreateShaderModule(screen->dev, &smci, NULL, &mod) != VK_SUCCESS)
       mod = VK_NULL_HANDLE;
 
+done:
    if (nir != zs->nir)
       ralloc_free(nir);