From 38bbfd3a57d68abdc88a93b436eac9f30a397b0f Mon Sep 17 00:00:00 2001 From: Pierre Moreau Date: Tue, 5 May 2020 13:13:19 +0200 Subject: [PATCH] clover/nir: Check the result of spirv_to_nir Fixes: deb04adf2ae ("clover: add support for passing kernels as nir to the driver") Signed-off-by: Pierre Moreau Reviewed-by: Karol Herbst Part-of: --- src/gallium/state_trackers/clover/nir/invocation.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gallium/state_trackers/clover/nir/invocation.cpp b/src/gallium/state_trackers/clover/nir/invocation.cpp index 87a98046cc1..46440d96e09 100644 --- a/src/gallium/state_trackers/clover/nir/invocation.cpp +++ b/src/gallium/state_trackers/clover/nir/invocation.cpp @@ -90,6 +90,11 @@ module clover::nir::spirv_to_nir(const module &mod, const device &dev, nir_shader *nir = spirv_to_nir(data, num_words, nullptr, 0, MESA_SHADER_KERNEL, name, &spirv_options, compiler_options); + if (!nir) { + r_log += "Translation from SPIR-V to NIR for kernel \"" + sym.name + + "\" failed.\n"; + throw build_error(); + } nir->info.cs.local_size_variable = true; nir_validate_shader(nir, "clover"); -- 2.30.2