aco: fix image load/store with lod and 1D images

Make sure to add the lod value if non-null as the 2nd operand.

Fixes dEQP-VK.image.load_store_lod.with_format.1d.* on all gens
except GFX9.

Fixes: 4d49a7ac73 ("aco: handle nir_intrinsic_image_deref_{load,store} with lod")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4060>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4060>
This commit is contained in:
Samuel Pitoiset 2020-03-05 11:32:06 +01:00
parent cc9493f78e
commit 7618fe1b48

View file

@ -4314,9 +4314,6 @@ static Temp get_image_coords(isel_context *ctx, const nir_intrinsic_instr *instr
}
}
if (count == 1 && !gfx9_1d)
return emit_extract_vector(ctx, src0, 0, v1);
if (gfx9_1d) {
coords[0] = emit_extract_vector(ctx, src0, 0, v1);
coords.resize(coords.size() + 1);