From e29f0ede757797bce38aa00bc706ae2224b66053 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 27 Jul 2018 15:32:36 +1000 Subject: [PATCH] ac: fix get_image_coords() for radeonsi MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Because this was setting image to true we would end up calling si_load_image_desc() when we sould be calling si_load_sampler_desc(). This fixes an assert() in Deus Ex: MD Reviewed-by: Marek Olšák --- 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 18644107eb4..a3f26ab46c9 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -2244,7 +2244,8 @@ static void get_image_coords(struct ac_nir_context *ctx, fmask_load_address[1], fmask_load_address[2], sample_index, - get_image_descriptor(ctx, instr, AC_DESC_FMASK, false)); + get_sampler_desc(ctx, nir_instr_as_deref(instr->src[0].ssa->parent_instr), + AC_DESC_FMASK, NULL, false, false)); } if (count == 1 && !gfx9_1d) { if (instr->src[1].ssa->num_components) -- 2.30.2