From a864ef7f4824a8319b74d4cf1c82e2dd25672ff1 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 6 Feb 2017 02:40:45 +0000 Subject: [PATCH] radv/ac: avoid the fmask path when doing txs. This fixes the vulkan samples deferredmultisampling test. Cc: "17.0" Reviewed-by: Bas Nieuwenhuizen Signed-off-by: Dave Airlie --- 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 db59c2ec28a..04b3259fc8c 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -3649,7 +3649,8 @@ static void visit_tex(struct nir_to_llvm_context *ctx, nir_tex_instr *instr) * The sample index should be adjusted as follows: * sample_index = (fmask >> (sample_index * 4)) & 0xF; */ - if (instr->sampler_dim == GLSL_SAMPLER_DIM_MS) { + if (instr->sampler_dim == GLSL_SAMPLER_DIM_MS && + instr->op != nir_texop_txs) { LLVMValueRef txf_address[4]; struct ac_tex_info txf_info = { 0 }; unsigned txf_count = count; -- 2.30.2