nir: generalize nir_vertex_divergence_analysis -> nir_custom_divergence_analysis

Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41225>
This commit is contained in:
Marek Olšák 2026-04-27 22:10:01 -04:00 committed by Marge Bot
parent 1ab8f1eb00
commit edb60c76e2
3 changed files with 5 additions and 5 deletions

View file

@ -6640,7 +6640,7 @@ void nir_convert_loop_to_lcssa(nir_loop *loop);
bool nir_convert_to_lcssa(nir_shader *shader, bool skip_invariants, bool skip_bool_invariants);
void nir_divergence_analysis_impl(nir_function_impl *impl, nir_divergence_options options);
void nir_divergence_analysis(nir_shader *shader);
void nir_vertex_divergence_analysis(nir_shader *shader);
void nir_custom_divergence_analysis(nir_shader *shader, nir_divergence_options options);
bool nir_has_divergent_loop(nir_shader *shader);
void

View file

@ -1637,10 +1637,10 @@ nir_divergence_analysis(nir_shader *shader)
* pass.
*/
void
nir_vertex_divergence_analysis(nir_shader *shader)
nir_custom_divergence_analysis(nir_shader *shader,
nir_divergence_options options)
{
nir_divergence_options options =
shader->options->divergence_analysis_options | nir_divergence_vertex;
options |= shader->options->divergence_analysis_options;
nir_foreach_function_impl(impl, shader) {
nir_divergence_analysis_impl(impl, options);

View file

@ -5426,7 +5426,7 @@ nir_opt_varyings(nir_shader *producer, nir_shader *consumer, bool spirv,
* divergence information.
*/
if (consumer->info.stage == MESA_SHADER_FRAGMENT) {
nir_vertex_divergence_analysis(producer);
nir_custom_divergence_analysis(producer, nir_divergence_vertex);
}
/* This also removes dead varyings. */