Mesa (master): radeonsi: fix pk2h breakage

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Jul 23 22:11:12 2018 -0400

radeonsi: fix pk2h breakage

---

 src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c
index 43922dc33c..c51d057967 100644
--- a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c
+++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c
@@ -611,14 +611,17 @@ static void emit_pk2h(const struct lp_build_tgsi_action *action,
 		      struct lp_build_tgsi_context *bld_base,
 		      struct lp_build_emit_data *emit_data)
 {
+	struct si_shader_context *ctx = si_shader_context(bld_base);
+
 	/* From the GLSL 4.50 spec:
 	 *   "The rounding mode cannot be set and is undefined."
 	 *
 	 * v_cvt_pkrtz_f16 rounds to zero, but it's fastest.
 	 */
 	emit_data->output[emit_data->chan] =
-		ac_build_cvt_pkrtz_f16(&si_shader_context(bld_base)->ac,
-				       emit_data->args);
+		LLVMBuildBitCast(ctx->ac.builder,
+				 ac_build_cvt_pkrtz_f16(&ctx->ac, emit_data->args),
+				 ctx->i32, "");
 }
 
 static void up2h_fetch_args(struct lp_build_tgsi_context *bld_base,