mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-12-11 11:15:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

nir/lower_io: change nir_io_add_const_offset_to_base to use bitfield modes

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6890>
This commit is contained in:
Samuel Pitoiset 2020-09-28 13:13:49 +02:00 committed by Marge Bot
parent 7685c37bf4
commit a0e35c7562
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4178,7 +4178,7 @@ bool nir_lower_io(nir_shader *shader,
int (*type_size)(const struct glsl_type *, bool),
nir_lower_io_options);
bool nir_io_add_const_offset_to_base(nir_shader *nir, nir_variable_mode mode);
bool nir_io_add_const_offset_to_base(nir_shader *nir, nir_variable_mode modes);
bool
nir_lower_vars_to_explicit_types(nir_shader *shader,

10
src/compiler/nir/nir_lower_io.c
View File

@ -2246,7 +2246,7 @@ static bool is_dual_slot(nir_intrinsic_instr *intrin)
static bool
add_const_offset_to_base_block(nir_block *block, nir_builder *b,
nir_variable_mode mode)
nir_variable_mode modes)
{
bool progress = false;
nir_foreach_instr_safe(instr, block) {
@ -2255,8 +2255,8 @@ add_const_offset_to_base_block(nir_block *block, nir_builder *b,
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if ((mode == nir_var_shader_in && is_input(intrin)) ||
(mode == nir_var_shader_out && is_output(intrin))) {
if (((modes & nir_var_shader_in) && is_input(intrin)) ||
((modes & nir_var_shader_out) && is_output(intrin))) {
nir_src *offset = nir_get_io_offset_src(intrin);
if (nir_src_is_const(*offset)) {
@ -2282,7 +2282,7 @@ add_const_offset_to_base_block(nir_block *block, nir_builder *b,
}
bool
nir_io_add_const_offset_to_base(nir_shader *nir, nir_variable_mode mode)
nir_io_add_const_offset_to_base(nir_shader *nir, nir_variable_mode modes)
{
bool progress = false;
@ -2291,7 +2291,7 @@ nir_io_add_const_offset_to_base(nir_shader *nir, nir_variable_mode mode)
nir_builder b;
nir_builder_init(&b, f->impl);
nir_foreach_block(block, f->impl) {
progress |= add_const_offset_to_base_block(block, &b, mode);
progress |= add_const_offset_to_base_block(block, &b, modes);
}
}
}