summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2019-10-25 00:06:34 -0400
committerMarek Olšák <[email protected]>2019-11-04 16:49:42 -0500
commit7d00218aed7c9bc6ff6fb10d5fe11844ab68305f (patch)
treef49ae44c6edd38a480f2e8a24b49757fea0cb12c /src
parent352b57d709918079d166fde67424f4f183de2a51 (diff)
st/mesa: call nir_opt_access only once
Reviewed-by: Connor Abbott <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_glsl_to_nir.cpp2
-rw-r--r--src/mesa/state_tracker/st_program.c2
2 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 d0ca8b0877b..e7b5060cfa9 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -309,8 +309,6 @@ st_nir_opts(nir_shader *nir)
lower_flrp = 0;
}
- NIR_PASS(progress, nir, nir_opt_access);
-
NIR_PASS(progress, nir, nir_opt_undef);
NIR_PASS(progress, nir, nir_opt_conditional_discard);
if (nir->options->max_unroll_iterations) {
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 6beb1ced785..1856ba8a43b 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -390,6 +390,8 @@ st_release_common_variants(struct st_context *st, struct st_common_program *p)
void
st_finalize_nir_before_variants(struct nir_shader *nir)
{
+ NIR_PASS_V(nir, nir_opt_access);
+
NIR_PASS_V(nir, nir_split_var_copies);
NIR_PASS_V(nir, nir_lower_var_copies);
if (nir->options->lower_all_io_to_temps ||