AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: rename nir_lower_io_to_scalar_early -> nir_lower_io_vars_to_scalar

Browse Source 
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35760>
This commit is contained in:
Marek Olšák
2025-06-25 17:45:31 -04:00
committed by Marge Bot
parent b83f618fb2
commit 439d805291
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/glsl/gl_nir_link_varyings.c
+2 -2
View File
@@ -4008,8 +4008,8 @@ link_shader_opts(struct varying_matches *vm,
*/
if (producer->options->lower_to_scalar && !vm->disable_varying_packing &&
!vm->disable_xfb_packing) {
NIR_PASS(_, producer, nir_lower_io_to_scalar_early, nir_var_shader_out);
NIR_PASS(_, consumer, nir_lower_io_to_scalar_early, nir_var_shader_in);
NIR_PASS(_, producer, nir_lower_io_vars_to_scalar, nir_var_shader_out);
NIR_PASS(_, consumer, nir_lower_io_vars_to_scalar, nir_var_shader_in);
}
gl_nir_opts(producer);
src/compiler/nir/nir.h
+1 -1
View File
@@ -5312,7 +5312,7 @@ void nir_lower_io_arrays_to_elements(nir_shader *producer, nir_shader *consumer)
bool nir_lower_io_arrays_to_elements_no_indirects(nir_shader *shader,
bool outputs_only);
bool nir_lower_io_to_scalar(nir_shader *shader, nir_variable_mode mask, nir_instr_filter_cb filter, void *filter_data);
bool nir_lower_io_to_scalar_early(nir_shader *shader, nir_variable_mode mask);
bool nir_lower_io_vars_to_scalar(nir_shader *shader, nir_variable_mode mask);
bool nir_lower_io_to_vector(nir_shader *shader, nir_variable_mode mask);
bool nir_vectorize_tess_levels(nir_shader *shader);
nir_shader *nir_create_passthrough_tcs_impl(const nir_shader_compiler_options *options,
src/compiler/nir/nir_lower_io_to_scalar.c
+3 -3
View File
@@ -493,7 +493,7 @@ struct io_to_scalar_early_state {
};
static bool
nir_lower_io_to_scalar_early_instr(nir_builder *b, nir_instr *instr, void *data)
nir_lower_io_vars_to_scalar_instr(nir_builder *b, nir_instr *instr, void *data)
{
struct io_to_scalar_early_state *state = data;
@@ -580,7 +580,7 @@ nir_lower_io_to_scalar_early_instr(nir_builder *b, nir_instr *instr, void *data)
* i.e. before nir_lower_io() is called.
*/
bool
nir_lower_io_to_scalar_early(nir_shader *shader, nir_variable_mode mask)
nir_lower_io_vars_to_scalar(nir_shader *shader, nir_variable_mode mask)
{
struct io_to_scalar_early_state state = {
.split_inputs = _mesa_pointer_hash_table_create(NULL),
@@ -589,7 +589,7 @@ nir_lower_io_to_scalar_early(nir_shader *shader, nir_variable_mode mask)
};
bool progress = nir_shader_instructions_pass(shader,
nir_lower_io_to_scalar_early_instr,
nir_lower_io_vars_to_scalar_instr,
nir_metadata_control_flow,
&state);