Commit 369d279f authored by Dave Airlie's avatar Dave Airlie Committed by Emil Velikov

ac/nir: don't apply slice rounding on txf_ms

This matches the tgsi code.

Fixes arb_texture_multisample texelFetch piglit tests.
Reviewed-by: Timothy Arceri's avatarTimothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Bas Nieuwenhuizen's avatarBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Fixes: f4e499ec (radv: add initial non-conformant radv vulkan driver)
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
(cherry picked from commit 69495b30)
[Emil Velikov: trivial conflicts]
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>

Conflicts:
	src/amd/common/ac_nir_to_llvm.c
parent 2f5c2135
......@@ -5003,7 +5003,7 @@ static void visit_tex(struct ac_nir_context *ctx, nir_tex_instr *instr)
/* This seems like a bit of a hack - but it passes Vulkan CTS with it */
if (instr->sampler_dim != GLSL_SAMPLER_DIM_3D &&
instr->sampler_dim != GLSL_SAMPLER_DIM_CUBE &&
instr->op != nir_texop_txf) {
instr->op != nir_texop_txf && instr->op != nir_texop_txf_ms) {
coords[2] = apply_round_slice(&ctx->ac, coords[2]);
}
address[count++] = coords[2];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment