OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: rename nir_link_constant_varyings() nir_link_opt_varyings()

Browse Source 
The following patches will add support for an additional
optimisation so this function will no longer just optimise varying
constants.

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Timothy Arceri
2018-12-11 11:49:00 +11:00
parent 0a4378ce56
commit 50de3f80a8
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/vulkan/radv_pipeline.c
View File

@@ -1814,7 +1814,7 @@ radv_link_shaders(struct radv_pipeline *pipeline, nir_shader **shaders)
nir_lower_io_arrays_to_elements(ordered_shaders[i], nir_lower_io_arrays_to_elements(ordered_shaders[i],
ordered_shaders[i - 1]); ordered_shaders[i - 1]);
if (nir_link_constant_varyings(ordered_shaders[i], if (nir_link_opt_varyings(ordered_shaders[i],
ordered_shaders[i - 1])) ordered_shaders[i - 1]))
radv_optimize_nir(ordered_shaders[i - 1], false, false); radv_optimize_nir(ordered_shaders[i - 1], false, false);

2
src/compiler/nir/nir.h
View File

@@ -2870,7 +2870,7 @@ bool nir_remove_unused_io_vars(nir_shader *shader, struct exec_list *var_list,
void nir_compact_varyings(nir_shader *producer, nir_shader *consumer, void nir_compact_varyings(nir_shader *producer, nir_shader *consumer,
bool default_to_smooth_interp); bool default_to_smooth_interp);
void nir_link_xfb_varyings(nir_shader *producer, nir_shader *consumer); void nir_link_xfb_varyings(nir_shader *producer, nir_shader *consumer);
bool nir_link_constant_varyings(nir_shader *producer, nir_shader *consumer); bool nir_link_opt_varyings(nir_shader *producer, nir_shader *consumer);
typedef enum { typedef enum {
/* If set, this forces all non-flat fragment shader inputs to be /* If set, this forces all non-flat fragment shader inputs to be

2
src/compiler/nir/nir_linking_helpers.c
View File

@@ -634,7 +634,7 @@ try_replace_constant_input(nir_shader *shader,
} }
bool bool
nir_link_constant_varyings(nir_shader *producer, nir_shader *consumer) nir_link_opt_varyings(nir_shader *producer, nir_shader *consumer)
{ {
/* TODO: Add support for more shader stage combinations */ /* TODO: Add support for more shader stage combinations */
if (consumer->info.stage != MESA_SHADER_FRAGMENT || if (consumer->info.stage != MESA_SHADER_FRAGMENT ||

2
src/intel/compiler/brw_nir.c
View File

@@ -771,7 +771,7 @@ brw_nir_link_shaders(const struct brw_compiler *compiler,
*consumer = brw_nir_optimize(*consumer, compiler, c_is_scalar, false); *consumer = brw_nir_optimize(*consumer, compiler, c_is_scalar, false);
} }
if (nir_link_constant_varyings(*producer, *consumer)) if (nir_link_opt_varyings(*producer, *consumer))
*consumer = brw_nir_optimize(*consumer, compiler, c_is_scalar, false); *consumer = brw_nir_optimize(*consumer, compiler, c_is_scalar, false);
NIR_PASS_V(*producer, nir_remove_dead_variables, nir_var_shader_out); NIR_PASS_V(*producer, nir_remove_dead_variables, nir_var_shader_out);

2
src/mesa/state_tracker/st_glsl_to_nir.cpp
View File

@@ -588,7 +588,7 @@ st_nir_link_shaders(nir_shader **producer, nir_shader **consumer, bool scalar)
{ {
nir_lower_io_arrays_to_elements(*producer, *consumer); nir_lower_io_arrays_to_elements(*producer, *consumer);
if (nir_link_constant_varyings(*producer, *consumer)) if (nir_link_opt_varyings(*producer, *consumer))
st_nir_opts(*consumer, scalar); st_nir_opts(*consumer, scalar);
NIR_PASS_V(*producer, nir_remove_dead_variables, nir_var_shader_out); NIR_PASS_V(*producer, nir_remove_dead_variables, nir_var_shader_out);