Mesa (master): ac: fix ac_build_umsb() for 16-bit integer type

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Mar 26 11:34:46 2019 +0100

ac: fix ac_build_umsb() for 16-bit integer type

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/common/ac_llvm_build.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
index 20c722e332e..fe280b31368 100644
--- a/src/amd/common/ac_llvm_build.c
+++ b/src/amd/common/ac_llvm_build.c
@@ -1970,7 +1970,12 @@ ac_build_umsb(struct ac_llvm_context *ctx,
 	/* The HW returns the last bit index from MSB, but TGSI/NIR wants
 	 * the index from LSB. Invert it by doing "31 - msb". */
 	msb = LLVMBuildSub(ctx->builder, highest_bit, msb, "");
-	msb = LLVMBuildTruncOrBitCast(ctx->builder, msb, ctx->i32, "");
+
+	if (bitsize == 64) {
+		msb = LLVMBuildTrunc(ctx->builder, msb, ctx->i32, "");
+	} else if (bitsize == 16) {
+		msb = LLVMBuildSExt(ctx->builder, msb, ctx->i32, "");
+	}
 
 	/* check for zero */
 	return LLVMBuildSelect(ctx->builder,