From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 18 May 2018 03:26:56 +0000 (-0400)
Subject: radeonsi: fix FBFETCH with 2D MSAA arrays
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=47a57a709d5f74feb0495cd49524a4907bd773ae;p=mesa.git

radeonsi: fix FBFETCH with 2D MSAA arrays

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c
index d0dd4e7cab9..d36ccf78905 100644
--- a/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c
+++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c
@@ -1865,7 +1865,8 @@ static void si_llvm_emit_fbfetch(const struct lp_build_tgsi_action *action,
 		fmask = ac_build_load_to_sgpr(&ctx->ac, ptr,
 			LLVMConstInt(ctx->i32, SI_PS_IMAGE_COLORBUF0_FMASK / 2, 0));
 
-		ac_apply_fmask_to_sample(&ctx->ac, fmask, args.coords, false);
+		ac_apply_fmask_to_sample(&ctx->ac, fmask, args.coords,
+					 ctx->shader->key.mono.u.ps.fbfetch_layered);
 	}
 
 	args.opcode = ac_image_load;