ac: fix get_image_coords() for radeonsi
authorTimothy Arceri <tarceri@itsqueeze.com>
Fri, 27 Jul 2018 05:32:36 +0000 (15:32 +1000)
committerTimothy Arceri <tarceri@itsqueeze.com>
Sat, 15 Sep 2018 02:23:32 +0000 (12:23 +1000)
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 <marek.olsak@amd.com>
src/amd/common/ac_nir_to_llvm.c

index 18644107eb47aef7f01f9f3a98d9fd5733f08d3b..a3f26ab46c98940ca5c8c86bf30ee03b595669f4 100644 (file)
@@ -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)