Module: Mesa Branch: staging/23.1 Commit: e649aaa746791980fd09e679d9f2340afb3e5ad1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e649aaa746791980fd09e679d9f2340afb3e5ad1
Author: Lionel Landwerlin <[email protected]> Date: Wed Jul 19 16:55:21 2023 +0300 intel/fs: fix missing predicate on SEL instruction Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: d8dfd153c5 ("intel/fs: Make per-sample and coarse dispatch tri-state") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9381 Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24236> (cherry picked from commit 46958bcb74f2766e0a613115559fd3b00b187fd6) --- .pick_status.json | 2 +- src/intel/compiler/brw_fs_visitor.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index b86a24ff1ef..751721b7afd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1570,7 +1570,7 @@ "description": "intel/fs: fix missing predicate on SEL instruction", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d8dfd153c50f24ea50578202832b3eccfb61edf8" }, diff --git a/src/intel/compiler/brw_fs_visitor.cpp b/src/intel/compiler/brw_fs_visitor.cpp index 05515c76d62..6db5e4eab45 100644 --- a/src/intel/compiler/brw_fs_visitor.cpp +++ b/src/intel/compiler/brw_fs_visitor.cpp @@ -597,7 +597,8 @@ fs_visitor::emit_interpolation_setup_gfx6() this->pixel_z = abld.vgrf(BRW_REGISTER_TYPE_F); /* We re-use the check_dynamic_msaa_flag() call from above */ - abld.SEL(this->pixel_z, coarse_z, sample_z); + set_predicate(BRW_PREDICATE_NORMAL, + abld.SEL(this->pixel_z, coarse_z, sample_z)); break; case BRW_ALWAYS:
