From a9ed96ac8e64c57bef18db134f815c0835d3f5b7 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 19 Aug 2022 15:02:29 +0200 Subject: [PATCH] radv: deal with ac_nir_translate failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that ac_nir_translate reports failures instead of aborting, we need to deal with it in the driver. For now, call abort to keep the existing behavior but this could be improved. Reviewed-by: Timur Kristóf Reviewed-by: Marek Olšák Part-of: --- src/amd/vulkan/radv_nir_to_llvm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index a5fd3f3eef5..f882d50ec19 100644 --- a/src/amd/vulkan/radv_nir_to_llvm.c +++ b/src/amd/vulkan/radv_nir_to_llvm.c @@ -1497,7 +1497,9 @@ ac_translate_nir_to_llvm(struct ac_llvm_compiler *ac_llvm, else if (shaders[shader_idx]->info.stage == MESA_SHADER_GEOMETRY && !info->is_ngg) prepare_gs_input_vgprs(&ctx, shader_count >= 2); - ac_nir_translate(&ctx.ac, &ctx.abi, &args->ac, shaders[shader_idx]); + if (!ac_nir_translate(&ctx.ac, &ctx.abi, &args->ac, shaders[shader_idx])) { + abort(); + } if (!gl_shader_stage_is_compute(shaders[shader_idx]->info.stage)) handle_shader_outputs_post(&ctx.abi);