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

nir: Return progress from nir_lower_io().

Browse source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Matt Turner 2017-03-09 11:01:22 -08:00
parent a934b00222
commit abc8a702d0
2 changed files with 15 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

@ -2379,7 +2379,7 @@ typedef enum {
*/
nir_lower_io_force_sample_interpolation = (1 << 1),
} nir_lower_io_options;
void nir_lower_io(nir_shader *shader,
bool nir_lower_io(nir_shader *shader,
nir_variable_mode modes,
int (*type_size)(const struct glsl_type *),
nir_lower_io_options);

19
src/compiler/nir/nir_lower_io.c
View file

@ -364,6 +364,7 @@ nir_lower_io_block(nir_block *block,
{
nir_builder *b = &state->builder;
const nir_shader_compiler_options *options = b->shader->options;
bool progress = false;
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
@ -474,18 +475,20 @@ nir_lower_io_block(nir_block *block,
nir_instr_insert_before(&intrin->instr, &replacement->instr);
nir_instr_remove(&intrin->instr);
progress = true;
}
return true;
return progress;
}
static void
static bool
nir_lower_io_impl(nir_function_impl *impl,
nir_variable_mode modes,
int (*type_size)(const struct glsl_type *),
nir_lower_io_options options)
{
struct lower_io_state state;
bool progress = false;
nir_builder_init(&state.builder, impl);
state.modes = modes;
@ -493,23 +496,29 @@ nir_lower_io_impl(nir_function_impl *impl,
state.options = options;
nir_foreach_block(block, impl) {
nir_lower_io_block(block, &state);
progress |= nir_lower_io_block(block, &state);
}
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
return progress;
}
void
bool
nir_lower_io(nir_shader *shader, nir_variable_mode modes,
int (*type_size)(const struct glsl_type *),
nir_lower_io_options options)
{
bool progress = false;
nir_foreach_function(function, shader) {
if (function->impl) {
nir_lower_io_impl(function->impl, modes, type_size, options);
progress |= nir_lower_io_impl(function->impl, modes,
type_size, options);
}
}
return progress;
}
/**