From 671f94c5b90c3afcf45d503a5d7cc0a208cf97b1 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 14 May 2021 16:30:16 -0700 Subject: [PATCH] mesa/st: Always call st_nir_lower_tex_src_plane if samplers were lowered Reviewed-by: Emma Anholt Part-of: --- src/mesa/state_tracker/st_program.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 945e2ca5169..f554bbe8c84 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -1450,6 +1450,8 @@ st_create_fp_variant(struct st_context *st, finalize = true; } + bool need_lower_tex_src_plane = false; + if (unlikely(key->external.lower_nv12 || key->external.lower_iyuv || key->external.lower_xy_uxvx || key->external.lower_yx_xuxv || key->external.lower_ayuv || key->external.lower_xyuv || @@ -1468,6 +1470,7 @@ st_create_fp_variant(struct st_context *st, options.lower_yuv_external = key->external.lower_yuv; NIR_PASS_V(state.ir.nir, nir_lower_tex, &options); finalize = true; + need_lower_tex_src_plane = true; } if (finalize || !st->allow_st_finalize_nir_twice) { @@ -1476,10 +1479,7 @@ st_create_fp_variant(struct st_context *st, } /* This pass needs to happen *after* nir_lower_sampler */ - if (unlikely(key->external.lower_nv12 || key->external.lower_iyuv || - key->external.lower_xy_uxvx || key->external.lower_yx_xuxv || - key->external.lower_ayuv || key->external.lower_xyuv || - key->external.lower_yuv)) { + if (unlikely(need_lower_tex_src_plane)) { NIR_PASS_V(state.ir.nir, st_nir_lower_tex_src_plane, ~stfp->Base.SamplersUsed, key->external.lower_nv12 | key->external.lower_xy_uxvx |