summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2017-02-06 02:40:45 +0000
committerDave Airlie <[email protected]>2017-02-06 22:57:52 +0000
commita864ef7f4824a8319b74d4cf1c82e2dd25672ff1 (patch)
tree6980fe1147d8756bd0b71708271827a2161fa0cb
parent11d6f836d096c433b08fd1b95f8b5034392450c2 (diff)
radv/ac: avoid the fmask path when doing txs.
This fixes the vulkan samples deferredmultisampling test. Cc: "17.0" <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
-rw-r--r--src/amd/common/ac_nir_to_llvm.c3
1 files changed, 2 insertions, 1 deletions
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;