From b2d000513e4a9b06d3b073913741dae47a00526e Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Mon, 4 Jan 2021 10:41:39 +0000 Subject: [PATCH] aco: fix incorrect address calculation for load_barycentric_at_sample MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix address calculation for indirect load_barycentric_at_sample on GFX6-8 with a uniform sample index. A non-zero uniform sample index does not seem to be tested by CTS. Signed-off-by: Rhys Perry Reviewed-by: Daniel Schürmann Gitlab: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3966 Fixes: 93c8ebfa780 ("aco: Initial commit of independent AMD compiler") Part-of: --- src/amd/compiler/aco_instruction_selection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 36cc72a4849..5492cd57b7b 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -7661,7 +7661,7 @@ void visit_intrinsic(isel_context *ctx, nir_intrinsic_instr *instr) offset = bld.sop2(aco_opcode::s_lshl3_add_u32, bld.def(s1), bld.def(s1, scc), addr, Operand(sample_pos_offset)); } else { offset = bld.sop2(aco_opcode::s_lshl_b32, bld.def(s1), bld.def(s1, scc), addr, Operand(3u)); - offset = bld.sop2(aco_opcode::s_add_u32, bld.def(s1), bld.def(s1, scc), addr, Operand(sample_pos_offset)); + offset = bld.sop2(aco_opcode::s_add_u32, bld.def(s1), bld.def(s1, scc), offset, Operand(sample_pos_offset)); } Operand off = bld.copy(bld.def(s1), Operand(offset));