From 6064b8ee14319d5a2f24a1a1fac49d14a2cf6f1f Mon Sep 17 00:00:00 2001 From: Icecream95 Date: Tue, 15 Sep 2020 11:57:50 +1200 Subject: [PATCH] pan/mdg: Return a bool from midgard_nir_lod_errata To match other NIR passes. Reviewed-by: Eric Anholt Reviewed-by: Alyssa Rosenzweig Part-of: --- src/panfrost/midgard/compiler.h | 2 +- src/panfrost/midgard/midgard_errata_lod.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h index f6218401515..b5a37037130 100644 --- a/src/panfrost/midgard/compiler.h +++ b/src/panfrost/midgard/compiler.h @@ -665,7 +665,7 @@ bool nir_undef_to_zero(nir_shader *shader); bool nir_fuse_io_16(nir_shader *shader); -void midgard_nir_lod_errata(nir_shader *shader); +bool midgard_nir_lod_errata(nir_shader *shader); unsigned midgard_get_first_tag_from_block(compiler_context *ctx, unsigned block_idx); diff --git a/src/panfrost/midgard/midgard_errata_lod.c b/src/panfrost/midgard/midgard_errata_lod.c index 55e2b230cb6..bdd7e4cf5bd 100644 --- a/src/panfrost/midgard/midgard_errata_lod.c +++ b/src/panfrost/midgard/midgard_errata_lod.c @@ -24,7 +24,7 @@ #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" -void midgard_nir_lod_errata(nir_shader *shader); +bool midgard_nir_lod_errata(nir_shader *shader); /* Workarounds errata pertaining to early Midgard chips where the settings for * min_lod/max_lod/lod_bias are ignored in the sampler descriptor when @@ -73,7 +73,7 @@ mir_lod_errata_body(nir_builder *b, nir_tex_instr *tex) } } -void +bool midgard_nir_lod_errata(nir_shader *shader) { nir_foreach_function(function, shader) { @@ -95,4 +95,5 @@ midgard_nir_lod_errata(nir_shader *shader) nir_metadata_preserve(function->impl, nir_metadata_block_index | nir_metadata_dominance); } + return true; }