From 5e997beeb75a495be00ec6a8f6a0fc8cd39d2ef6 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 18 Apr 2023 22:05:28 +0200 Subject: [PATCH] mesa/st: allow using nir for ff-fragment shaders MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is similar to what we do for ff-vertex shaders. Reviewed-by: Adam Jackson Acked-by: Marek Olšák Reviewed-by: Emma Anholt Part-of: --- src/mesa/state_tracker/st_program.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 31a57c9..2f16a6c 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -865,7 +865,7 @@ st_translate_fragment_program(struct st_context *st, /* Translate to NIR. ATI_fs translates at variant time. */ if (!prog->ati_fs) { - if (prog->nir) + if (prog->nir && prog->arb.Instructions) ralloc_free(prog->nir); if (prog->serialized_nir) { @@ -874,8 +874,11 @@ st_translate_fragment_program(struct st_context *st, } prog->state.type = PIPE_SHADER_IR_NIR; - prog->nir = st_translate_prog_to_nir(st, prog, - MESA_SHADER_FRAGMENT); + if (prog->arb.Instructions) + prog->nir = st_translate_prog_to_nir(st, prog, + MESA_SHADER_FRAGMENT); + else + st_prog_to_nir_postprocess(st, prog->nir, prog); prog->info = prog->nir->info; } -- 2.7.4