Mesa (staging/19.0): ac/nir: Return frag_coord as integer.

[GitLab Mirror]

Module: Mesa
Branch: staging/19.0
Commit: bb66e6172740ce6a5747c818441cd050a639b95d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb66e6172740ce6a5747c818441cd050a639b95d

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Tue Mar 19 01:29:43 2019 +0100

ac/nir: Return frag_coord as integer.

To preserve the invariant that nir ssa defs are integers or pointers
in LLVM.

CC: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 82075e3c421b1de7661e61879f2dcbc66011e466)

---

 src/amd/common/ac_nir_to_llvm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index b71f5bd2c6d..3151ea221db 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3093,7 +3093,8 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
 			ctx->abi->frag_pos[2],
 			ac_build_fdiv(&ctx->ac, ctx->ac.f32_1, ctx->abi->frag_pos[3])
 		};
-		result = ac_build_gather_values(&ctx->ac, values, 4);
+		result = ac_to_integer(&ctx->ac,
+		                       ac_build_gather_values(&ctx->ac, values, 4));
 		break;
 	}
 	case nir_intrinsic_load_front_face: