mesa: Move st_prog_to_nir_postprocess out of prog_to_nir.
authorEmma Anholt <emma@anholt.net>
Tue, 16 May 2023 23:44:57 +0000 (16:44 -0700)
committerMarge Bot <emma+marge@anholt.net>
Thu, 1 Jun 2023 23:57:32 +0000 (23:57 +0000)
We called it in the else branch, anyway.

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23111>

src/mesa/state_tracker/st_program.c

index 5a6d4cc..2892b36 100644 (file)
@@ -419,8 +419,6 @@ st_translate_prog_to_nir(struct st_context *st, struct gl_program *prog,
    /* Translate to NIR */
    nir_shader *nir = prog_to_nir(st->ctx, prog, options);
 
-   st_prog_to_nir_postprocess(st, nir, prog);
-
    return nir;
 }
 
@@ -606,8 +604,7 @@ st_translate_vertex_program(struct st_context *st,
    if (prog->arb.Instructions)
       prog->nir = st_translate_prog_to_nir(st, prog,
                                            MESA_SHADER_VERTEX);
-   else
-      st_prog_to_nir_postprocess(st, prog->nir, prog);
+   st_prog_to_nir_postprocess(st, prog->nir, prog);
    prog->info = prog->nir->info;
 
    st_prepare_vertex_program(prog);
@@ -873,8 +870,7 @@ st_translate_fragment_program(struct st_context *st,
       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);
+      st_prog_to_nir_postprocess(st, prog->nir, prog);
       prog->info = prog->nir->info;
    }