fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 10:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/st: Always call st_nir_lower_tex_src_plane if samplers were lowered

Browse source 
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9610>
This commit is contained in:
Ian Romanick 2021-05-14 16:30:16 -07:00 • committed by Marge Bot
parent 5e1503f243
commit 671f94c5b9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/state_tracker/st_program.c
View file

@ -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 |