[Mesa-dev] [PATCH v2 50/73] ac/nir: handle old-style shadow tex instructions correctly

[Nicolai Hähnle]

From: Nicolai Hähnle <nicolai.haehnle at amd.com>

The first element is only extracted for new-style shadow tex.
---
 src/amd/common/ac_nir_to_llvm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 158d183..16729a8 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -4591,21 +4591,23 @@ static void visit_tex(struct ac_nir_context *ctx, nir_tex_instr *instr)
 		else
 			dmask = 1 << instr->component;
 	}
 	set_tex_fetch_args(&ctx->ac, &args, instr, instr->op,
 			   res_ptr, samp_ptr, address, count, dmask);
 
 	result = build_tex_intrinsic(ctx, instr, lod_is_zero, &args);
 
 	if (instr->op == nir_texop_query_levels)
 		result = LLVMBuildExtractElement(ctx->ac.builder, result, LLVMConstInt(ctx->ac.i32, 3, false), "");
-	else if (instr->is_shadow && instr->op != nir_texop_txs && instr->op != nir_texop_lod && instr->op != nir_texop_tg4)
+	else if (instr->is_shadow && instr->is_new_style_shadow &&
+		 instr->op != nir_texop_txs && instr->op != nir_texop_lod &&
+		 instr->op != nir_texop_tg4)
 		result = LLVMBuildExtractElement(ctx->ac.builder, result, ctx->ac.i32_0, "");
 	else if (instr->op == nir_texop_txs &&
 		 instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE &&
 		 instr->is_array) {
 		LLVMValueRef two = LLVMConstInt(ctx->ac.i32, 2, false);
 		LLVMValueRef six = LLVMConstInt(ctx->ac.i32, 6, false);
 		LLVMValueRef z = LLVMBuildExtractElement(ctx->ac.builder, result, two, "");
 		z = LLVMBuildSDiv(ctx->ac.builder, z, six, "");
 		result = LLVMBuildInsertElement(ctx->ac.builder, result, z, two, "");
 	} else if (instr->dest.ssa.num_components != 4)
-- 
2.9.3