diff options
| author | Dave Airlie <[email protected]> | 2017-02-06 02:40:45 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-02-10 11:06:59 +0000 |
| commit | 1e868de4500a46abde745a517ead42afd3a904ca (patch) | |
| tree | 131889493fe976e1faf896cab4f2d25f4a923e33 /src/amd | |
| parent | be48168be94f669a050cbe76bd2ed05566cf4b96 (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]>
(cherry picked from commit a864ef7f4824a8319b74d4cf1c82e2dd25672ff1)
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 3 |
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 319bb3ecadd..4d29099e753 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -3405,7 +3405,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; |