Mesa (master): mesa/st: fix st_nir_lower_tex_src_plane arguments

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 72c54713aaed464e871c7177298e76f0202be252
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=72c54713aaed464e871c7177298e76f0202be252

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Tue Mar 30 21:42:15 2021 +0200

mesa/st: fix st_nir_lower_tex_src_plane arguments

st_nir_lower_tex_src_plane expects a mask, no a boolean.

CC: mesa-stable
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Acked-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9931>

---

 src/mesa/state_tracker/st_program.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 1cf2a01758d..b72813dcd6a 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -1482,7 +1482,7 @@ st_create_fp_variant(struct st_context *st,
                    key->external.lower_yuv)) {
          NIR_PASS_V(state.ir.nir, st_nir_lower_tex_src_plane,
                     ~stfp->Base.SamplersUsed,
-                    key->external.lower_nv12 || key->external.lower_xy_uxvx ||
+                    key->external.lower_nv12 | key->external.lower_xy_uxvx |
                        key->external.lower_yx_xuxv,
                     key->external.lower_iyuv);
          finalize = true;