KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: handle errors in nir_to_spirv 

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

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9836>
This commit is contained in:
Erik Faye-Lund 2021-02-04 14:28:46 +01:00 committed by Marge Bot
parent e76531ea7b
commit 904b5eb2af
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/zink/zink_compiler.c
View File

@ -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);