Mesa (master): radeon/llvm: fix TGSI_OPCODE_UCMP

Marek Olšák mareko at kemper.freedesktop.org
Sun Sep 29 13:48:24 UTC 2013


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Sep 25 20:07:16 2013 +0200

radeon/llvm: fix TGSI_OPCODE_UCMP

This doesn't fix any known issue (I haven't run piglit with this yet),
but the code was obviously completely wrong. It looks like copy-pasted from CMP.

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

---

 .../drivers/radeon/radeon_setup_tgsi_llvm.c        |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
index dfc7a3f..286ccdd 100644
--- a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
+++ b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
@@ -827,10 +827,14 @@ static void emit_ucmp(
 {
 	LLVMBuilderRef builder = bld_base->base.gallivm->builder;
 
-	LLVMValueRef v = LLVMBuildFCmp(builder, LLVMRealUGE,
-			emit_data->args[0], lp_build_const_float(bld_base->base.gallivm, 0.), "");
+	LLVMValueRef arg0 = LLVMBuildBitCast(builder, emit_data->args[0],
+					     bld_base->uint_bld.elem_type, "");
 
-	emit_data->output[emit_data->chan] = LLVMBuildSelect(builder, v, emit_data->args[2], emit_data->args[1], "");
+	LLVMValueRef v = LLVMBuildICmp(builder, LLVMIntNE, arg0,
+				       bld_base->uint_bld.zero, "");
+
+	emit_data->output[emit_data->chan] =
+		LLVMBuildSelect(builder, v, emit_data->args[1], emit_data->args[2], "");
 }
 
 static void emit_cmp(




More information about the mesa-commit mailing list