Mesa (18.2): radeonsi: NaN should pass kill_if

[GitLab Mirror]

Module: Mesa
Branch: 18.2
Commit: 3e1b0a085347997c9482501f11fd048c28f4e0ba
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e1b0a085347997c9482501f11fd048c28f4e0ba

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Oct  1 14:29:20 2018 -0400

radeonsi: NaN should pass kill_if

Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

---

 bin/.cherry-ignore                                | 2 ++
 src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index fb3038c8b3..93b0a25cfc 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -13,3 +13,5 @@ c9f54486959716762e6818dabb0a73a8cd46df67 radeonsi: fix regression in indirect in
 4aec44c0d9c4c0649c362199fac97efe0a3b38a4 i965/tools: 32bit compilation with meson
 # pick:   This commit was reverted by commit 95bb7d82ca8.
 90819abb56f6b1a0cd4946b13b6caf24fb46e500 radv: fix descriptor pool allocation size
+# pick:   There is a specific patch for stable branch for this commit.
+0d495bec25bd7584de4e988c2b4528c1996bc1d0 radeonsi: NaN should pass kill_if
diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c
index 7042bc306c..0d29286442 100644
--- a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c
+++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c
@@ -36,7 +36,8 @@ static void kill_if_fetch_args(struct lp_build_tgsi_context *bld_base,
 
 	for (i = 0; i < TGSI_NUM_CHANNELS; i++) {
 		LLVMValueRef value = lp_build_emit_fetch(bld_base, inst, 0, i);
-		conds[i] = LLVMBuildFCmp(builder, LLVMRealOGE, value,
+		/* UGE because NaN shouldn't get killed */
+		conds[i] = LLVMBuildFCmp(builder, LLVMRealUGE, value,
 					ctx->ac.f32_0, "");
 	}