Skip to content

Commit

Permalink
nir: Return progress from nir_lower_64bit_pack().
Browse files Browse the repository at this point in the history
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
  • Loading branch information
mattst88 committed Mar 23, 2017
1 parent 0012a61 commit adb157d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/compiler/nir/nir.h
Expand Up @@ -2568,7 +2568,7 @@ typedef enum {
} nir_lower_doubles_options;

bool nir_lower_doubles(nir_shader *shader, nir_lower_doubles_options options);
void nir_lower_64bit_pack(nir_shader *shader);
bool nir_lower_64bit_pack(nir_shader *shader);

bool nir_normalize_cubemap_coords(nir_shader *shader);

Expand Down
16 changes: 13 additions & 3 deletions src/compiler/nir/nir_lower_64bit_packing.c
Expand Up @@ -48,11 +48,12 @@ lower_unpack_64(nir_builder *b, nir_ssa_def *src)
nir_unpack_64_2x32_split_y(b, src));
}

static void
static bool
lower_64bit_pack_impl(nir_function_impl *impl)
{
nir_builder b;
nir_builder_init(&b, impl);
bool progress = false;

nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {
Expand Down Expand Up @@ -83,15 +84,24 @@ lower_64bit_pack_impl(nir_function_impl *impl)

nir_ssa_def_rewrite_uses(&alu_instr->dest.dest.ssa, nir_src_for_ssa(dest));
nir_instr_remove(&alu_instr->instr);
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
progress = true;
}
}

return progress;
}

void
bool
nir_lower_64bit_pack(nir_shader *shader)
{
bool progress = false;

nir_foreach_function(function, shader) {
if (function->impl)
lower_64bit_pack_impl(function->impl);
progress |= lower_64bit_pack_impl(function->impl);
}

return false;
}

0 comments on commit adb157d

Please sign in to comment.