commit 1e868de4500a46abde745a517ead42afd3a904ca
author Dave Airlie <airlied@redhat.com> Mon Feb 06 02:40:45 2017 +0000
committer Emil Velikov <emil.l.velikov@gmail.com> Fri Feb 10 11:06:59 2017 +0000
tree 131889493fe976e1faf896cab4f2d25f4a923e33
parent be48168be94f669a050cbe76bd2ed05566cf4b96

radv/ac: avoid the fmask path when doing txs.

This fixes the vulkan samples deferredmultisampling test.

Cc: "17.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit a864ef7f4824a8319b74d4cf1c82e2dd25672ff1)

src/amd/common/ac_nir_to_llvm.c

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 319bb3e..4d29099 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3405,7 +3405,8 @@
 	 * 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;