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_blend.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_blend.c')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_nir_lower_blend.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c index c616122..8cad4b7 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c @@ -674,10 +674,8 @@ vc4_nir_lower_blend_instr(struct vc4_compile *c, nir_builder *b, } static bool -vc4_nir_lower_blend_block(nir_block *block, void *state) +vc4_nir_lower_blend_block(nir_block *block, struct vc4_compile *c) { - struct vc4_compile *c = state; - nir_foreach_instr_safe(instr, block) { if (instr->type != nir_instr_type_intrinsic) continue; @@ -714,8 +712,9 @@ vc4_nir_lower_blend(nir_shader *s, struct vc4_compile *c) { nir_foreach_function(function, s) { if (function->impl) { - nir_foreach_block_call(function->impl, - vc4_nir_lower_blend_block, c); + nir_foreach_block(block, function->impl) { + vc4_nir_lower_blend_block(block, c); + } nir_metadata_preserve(function->impl, nir_metadata_block_index | |