diff options
| author | Connor Abbott <cwabbott0@gmail.com> | 2016-04-12 23:59:06 -0400 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-05-05 16:19:41 -0700 |
| commit | 7c36f9eb52ead4cb5cd0f81d1f282e0568223ca3 (patch) | |
| tree | fd2461be5cd2b76441d2585006b722f18d3af4fa /src/gallium/drivers/vc4/vc4_nir_lower_io.c | |
| parent | 582815d9ea053aafb00ad1ceaa1292fec21a4393 (diff) | |
| download | external_mesa3d-7c36f9eb52ead4cb5cd0f81d1f282e0568223ca3.zip external_mesa3d-7c36f9eb52ead4cb5cd0f81d1f282e0568223ca3.tar.gz external_mesa3d-7c36f9eb52ead4cb5cd0f81d1f282e0568223ca3.tar.bz2 | |
vc4: fixup for new nir_foreach_block()
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_nir_lower_io.c')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_nir_lower_io.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_io.c b/src/gallium/drivers/vc4/vc4_nir_lower_io.c index 3598268..261c00d 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_io.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_io.c @@ -428,25 +428,15 @@ vc4_nir_lower_io_instr(struct vc4_compile *c, nir_builder *b, } static bool -vc4_nir_lower_io_block(nir_block *block, void *arg) +vc4_nir_lower_io_impl(struct vc4_compile *c, nir_function_impl *impl) { - struct vc4_compile *c = arg; - nir_function_impl *impl = - nir_cf_node_get_function(&block->cf_node); - nir_builder b; nir_builder_init(&b, impl); - nir_foreach_instr_safe(instr, block) - vc4_nir_lower_io_instr(c, &b, instr); - - return true; -} - -static bool -vc4_nir_lower_io_impl(struct vc4_compile *c, nir_function_impl *impl) -{ - nir_foreach_block_call(impl, vc4_nir_lower_io_block, c); + nir_foreach_block(block, impl) { + nir_foreach_instr_safe(instr, block) + vc4_nir_lower_io_instr(c, &b, instr); + } nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); |