OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/main: allow passing nir-shaders to st_program_string_notify

Browse Source 
This will enable us to emit NIR directly for fixed-function vertex
shaders.

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/22520>
This commit is contained in:
Erik Faye-Lund
2023-04-18 12:23:15 +02:00
committed by Marge Bot
parent fdd20b9469
commit 7610747e94
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/state_tracker/st_program.c
View File

@@ -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);