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

glsl: add a helper for duplicated code calling nir_opt_varyings

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32175>
This commit is contained in:
Marek Olšák 2024-11-13 18:34:03 -05:00 • committed by Marge Bot
parent 93c8a65dee
commit 6cd302dc39
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/compiler/glsl/gl_nir_linker.c
View file

@ -1484,6 +1484,22 @@ get_varying_nir_var_mask(nir_shader *nir)
(nir->info.stage != MESA_SHADER_FRAGMENT ? nir_var_shader_out : 0);
}
static nir_opt_varyings_progress
optimize_varyings(nir_shader *producer, nir_shader *consumer, bool spirv,
unsigned max_uniform_comps, unsigned max_ubos)
{
nir_opt_varyings_progress progress =
nir_opt_varyings(producer, consumer, spirv, max_uniform_comps,
max_ubos);
if (progress & nir_progress_producer)
gl_nir_opts(producer);
if (progress & nir_progress_consumer)
gl_nir_opts(consumer);
return progress;
}
/**
* Lower load_deref and store_deref on input/output variables to load_input
* and store_output intrinsics, and perform varying optimizations and
@ -1568,36 +1584,17 @@ gl_nir_lower_optimize_varyings(const struct gl_constants *consts,
*/
unsigned highest_changed_producer = 0;
for (unsigned i = 0; i < num_shaders - 1; i++) {
nir_shader *producer = shaders[i];
nir_shader *consumer = shaders[i + 1];
nir_opt_varyings_progress progress =
nir_opt_varyings(producer, consumer, spirv, max_uniform_comps,
max_ubos);
if (progress & nir_progress_producer) {
gl_nir_opts(producer);
if (optimize_varyings(shaders[i], shaders[i + 1], spirv,
max_uniform_comps, max_ubos) & nir_progress_producer)
highest_changed_producer = i;
}
if (progress & nir_progress_consumer)
gl_nir_opts(consumer);
}
/* Optimize varyings from the highest changed producer to the first
* shader.
*/
for (unsigned i = highest_changed_producer; i > 0; i--) {
nir_shader *producer = shaders[i - 1];
nir_shader *consumer = shaders[i];
nir_opt_varyings_progress progress =
nir_opt_varyings(producer, consumer, spirv, max_uniform_comps,
max_ubos);
if (progress & nir_progress_producer)
gl_nir_opts(producer);
if (progress & nir_progress_consumer)
gl_nir_opts(consumer);
optimize_varyings(shaders[i - 1], shaders[i], spirv, max_uniform_comps,
max_ubos);
}
/* Final cleanups. */