Reviewed-by: Bas Nieuwenhuizen <[email protected]>
On Mon, Feb 6, 2017, at 03:41, Dave Airlie wrote: > From: Dave Airlie <[email protected]> > > This fixes the vulkan samples deferredmultisampling test. > > Cc: "17.0" <[email protected]> > Signed-off-by: Dave Airlie <[email protected]> > --- > 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 566516f..dbd65f6 100644 > --- a/src/amd/common/ac_nir_to_llvm.c > +++ b/src/amd/common/ac_nir_to_llvm.c > @@ -3648,7 +3648,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.7.4 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
