From 7610747e9446fc367e28fae30c3d9f72e3f8f749 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 18 Apr 2023 12:23:15 +0200 Subject: [PATCH] mesa/main: allow passing nir-shaders to st_program_string_notify MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This will enable us to emit NIR directly for fixed-function vertex shaders. 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 855cec4..5d39b2e 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -598,7 +598,7 @@ st_translate_vertex_program(struct st_context *st, if (prog->Parameters->NumParameters) prog->affected_states |= ST_NEW_VS_CONSTANTS; - if (prog->nir) + if (prog->arb.Instructions && prog->nir) ralloc_free(prog->nir); if (prog->serialized_nir) { @@ -607,8 +607,11 @@ st_translate_vertex_program(struct st_context *st, } prog->state.type = PIPE_SHADER_IR_NIR; - prog->nir = st_translate_prog_to_nir(st, prog, - MESA_SHADER_VERTEX); + 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); prog->info = prog->nir->info; st_prepare_vertex_program(prog); -- 2.7.4