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

st/mesa: inline st_finalize_nir_before_variants

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33146>
This commit is contained in:
Marek Olšák
2024-12-24 17:10:13 -05:00
committed by Marge Bot
parent 02516ff0f9
commit 2c5deaa98b
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesa/state_tracker/st_glsl_to_nir.cpp
View File

@@ -316,8 +316,7 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog,
} }
st_set_prog_affected_state_flags(prog); st_set_prog_affected_state_flags(prog);
nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
st_finalize_nir_before_variants(nir);
char *msg = NULL; char *msg = NULL;
if (st->allow_st_finalize_nir_twice) { if (st->allow_st_finalize_nir_twice) {

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

@@ -346,12 +346,6 @@ st_release_program(struct st_context *st, struct gl_program **p)
_mesa_reference_program(st->ctx, p, NULL); _mesa_reference_program(st->ctx, p, NULL);
} }
void
st_finalize_nir_before_variants(struct nir_shader *nir)
{
nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
}
static void static void
st_prog_to_nir_postprocess(struct st_context *st, nir_shader *nir, st_prog_to_nir_postprocess(struct st_context *st, nir_shader *nir,
struct gl_program *prog) struct gl_program *prog)
@@ -374,9 +368,9 @@ st_prog_to_nir_postprocess(struct st_context *st, nir_shader *nir,
NIR_PASS(_, nir, nir_opt_constant_folding); NIR_PASS(_, nir, nir_opt_constant_folding);
gl_nir_opts(nir); gl_nir_opts(nir);
nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
/* This must be done after optimizations to assign IO bases. */ /* This must be done after optimizations to assign IO bases. */
nir_recompute_io_bases(nir, nir_var_shader_in | nir_var_shader_out); nir_recompute_io_bases(nir, nir_var_shader_in | nir_var_shader_out);
st_finalize_nir_before_variants(nir);
if (st->allow_st_finalize_nir_twice) { if (st->allow_st_finalize_nir_twice) {
st_serialize_base_nir(prog, nir); st_serialize_base_nir(prog, nir);

3
src/mesa/state_tracker/st_program.h
View File

@@ -359,9 +359,6 @@ st_release_program(struct st_context *st, struct gl_program **p);
extern void extern void
st_destroy_program_variants(struct st_context *st); st_destroy_program_variants(struct st_context *st);
extern void
st_finalize_nir_before_variants(struct nir_shader *nir);
extern void extern void
st_prepare_vertex_program(struct gl_program *stvp); st_prepare_vertex_program(struct gl_program *stvp);