diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-06-02 17:44:34 -0400 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-06-05 23:16:36 +0000 |
| commit | 5b5eb77a87dfba362fffba680f603f01cdd2fcd9 (patch) | |
| tree | 2aeb640d64decc0ff5e271b4c0ffd10a33020372 | |
| parent | 93d9f086a315f1c866aa9ca7d57010d045652855 (diff) | |
st/glsl_to_nir: call st_set_prog_affected_state_flags() as late as possible
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>
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 4911e49fcda..b12fc3f6c25 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -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; |