fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 14:00:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

st/glsl_to_nir: call st_set_prog_affected_state_flags() as late as possible

Browse source 
this function should be called late to allow for other passes potentially
making changes which affect the states in use by shaders

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16749>
This commit is contained in:
Mike Blumenkrantz 2022-06-02 17:44:34 -04:00 • committed by Marge Bot
parent 93d9f086a3
commit 5b5eb77a87
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/state_tracker/st_glsl_to_nir.cpp
View file

@ -481,8 +481,6 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog,
*/
_mesa_ensure_and_associate_uniform_storage(st->ctx, shader_program, prog, 28);
st_set_prog_affected_state_flags(prog);
/* None of the builtins being lowered here can be produced by SPIR-V. See
* _mesa_builtin_uniform_desc. Also drivers that support packed uniform
* storage don't need to lower builtins.
@ -531,6 +529,8 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog,
if (!st->has_hw_atomics && !screen->get_param(screen, PIPE_CAP_NIR_ATOMICS_AS_DEREF))
NIR_PASS_V(nir, nir_lower_atomics_to_ssbo);
st_set_prog_affected_state_flags(prog);
st_finalize_nir_before_variants(nir);
char *msg = NULL;