From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Tue, 18 Apr 2023 20:05:28 +0000 (+0200)
Subject: mesa/st: allow using nir for ff-fragment shaders
X-Git-Tag: upstream/23.3.3~8384
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e997beeb75a495be00ec6a8f6a0fc8cd39d2ef6;p=platform%2Fupstream%2Fmesa.git

mesa/st: allow using nir for ff-fragment shaders

This is similar to what we do for ff-vertex shaders.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22755>
---

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;
    }