From 65d82c84d2902cc4ef4db8670e059f7449e550bd Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 18 Dec 2018 15:21:56 +0100 Subject: [PATCH] ac/nir: restrict fmask lookup to image load intrinsics We don't ever want to do the fmask lookup on a atomic or store, the fmask should have been decompressed if the surface has been moved to IMAGE_LAYOUT. Original patch by Dave Airlie. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/common/ac_nir_to_llvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 81b76f65b82..6d97212b805 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -2249,7 +2249,7 @@ static void get_image_coords(struct ac_nir_context *ctx, bool gfx9_1d = ctx->ac.chip_class >= GFX9 && dim == GLSL_SAMPLER_DIM_1D; count = image_type_to_components_count(dim, is_array); - if (is_ms) { + if (is_ms && instr->intrinsic == nir_intrinsic_image_deref_load) { LLVMValueRef fmask_load_address[3]; int chan; -- 2.30.2