radv: Move nir_opt_shrink_vectors() into the opt loop.

[mesa.git] / src / amd / vulkan / radv_shader.c

diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 16253979b0862ec1bd28dd84af2c0354a9a362aa..03cfe993bebc83776e1e881c1ffd7e42099e0d44 100644 (file)
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -278,13 +278,13 @@ radv_optimize_nir(struct nir_shader *shader, bool optimize_conservatively,
                 }
 
                 NIR_PASS(progress, shader, nir_opt_undef);
                 }
 
                 NIR_PASS(progress, shader, nir_opt_undef);

+                NIR_PASS(progress, shader, nir_opt_shrink_vectors);

                 if (shader->options->max_unroll_iterations) {
                         NIR_PASS(progress, shader, nir_opt_loop_unroll, 0);
                 }
         } while (progress && !optimize_conservatively);
 
        NIR_PASS(progress, shader, nir_opt_conditional_discard);
                 if (shader->options->max_unroll_iterations) {
                         NIR_PASS(progress, shader, nir_opt_loop_unroll, 0);
                 }
         } while (progress && !optimize_conservatively);
 
        NIR_PASS(progress, shader, nir_opt_conditional_discard);

-        NIR_PASS(progress, shader, nir_opt_shrink_vectors);

         NIR_PASS(progress, shader, nir_opt_move, nir_move_load_ubo);
 }
 
         NIR_PASS(progress, shader, nir_opt_move, nir_move_load_ubo);
 }