Module: Mesa Branch: master Commit: 7618fe1b484eecc2246202df1e53ee607c6d70c4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7618fe1b484eecc2246202df1e53ee607c6d70c4
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Thu Mar 5 11:32:06 2020 +0100 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: 4d49a7ac737 ("aco: handle nir_intrinsic_image_deref_{load,store} with lod") Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Reviewed-by: Daniel Schürmann <dan...@schuermann.dev> Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@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> --- src/amd/compiler/aco_instruction_selection.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 414fd811a30..a60e57189e3 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -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); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit