Mesa (master): radv/ac: round cube array coordinate before fixup.

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Mar 15 15:45:05 2017 +1000

radv/ac: round cube array coordinate before fixup.

This fixes:
dEQP-VK.glsl.texture_functions.texture.samplercubearray*

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

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

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index da38331cea..7ac9a1a316 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -4236,6 +4236,8 @@ static void visit_tex(struct nir_to_llvm_context *ctx, nir_tex_instr *instr)
 	}
 
 	if (instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE && coord) {
+		if (instr->is_array && instr->op != nir_texop_lod)
+			coords[3] = apply_round_slice(ctx, coords[3]);
 		for (chan = 0; chan < instr->coord_components; chan++)
 			coords[chan] = to_float(ctx, coords[chan]);
 		if (instr->coord_components == 3)
@@ -4263,7 +4265,9 @@ static void visit_tex(struct nir_to_llvm_context *ctx, nir_tex_instr *instr)
 		}
 		if (instr->coord_components > 2) {
 			/* This seems like a bit of a hack - but it passes Vulkan CTS with it */
-			if (instr->sampler_dim != GLSL_SAMPLER_DIM_3D && instr->op != nir_texop_txf) {
+			if (instr->sampler_dim != GLSL_SAMPLER_DIM_3D &&
+			    instr->sampler_dim != GLSL_SAMPLER_DIM_CUBE &&
+			    instr->op != nir_texop_txf) {
 				coords[2] = apply_round_slice(ctx, coords[2]);
 			}
 			address[count++] = coords[2];