Module: Mesa Branch: master Commit: 5705ecb6f4d909390c6fe6b1485c5a2880103bba URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5705ecb6f4d909390c6fe6b1485c5a2880103bba
Author: Christian Gmeiner <[email protected]> Date: Thu Feb 25 14:01:28 2021 +0100 etnaviv: fix etna_nir_lower_ubo_to_uniform pass The restoring of the acutal uniform offset was wrong. Fixes: 1837135f7ca ("etnaviv: nir: add ubo lowering pass") Signed-off-by: Christian Gmeiner <[email protected]> Acked-by: Lucas Stach <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9305> --- src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c index 3b7db740240..8f3485ec87e 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c +++ b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c @@ -56,9 +56,15 @@ lower_ubo_to_uniform(nir_builder *b, nir_instr *instr, void *_data) nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr); b->cursor = nir_before_instr(instr); + /* Undo the operations done in nir_lower_uniforms_to_ubo. */ nir_ssa_def *ubo_offset = nir_ssa_for_src(b, intr->src[1], 1); + nir_ssa_def *range_base = nir_imm_int(b, nir_intrinsic_range_base(intr)); + + nir_ssa_def *uniform_offset = + nir_ushr(b, nir_isub(b, ubo_offset, range_base), nir_imm_int(b, 4)); + nir_ssa_def *uniform = - nir_load_uniform(b, intr->num_components, intr->dest.ssa.bit_size, ubo_offset, + nir_load_uniform(b, intr->num_components, intr->dest.ssa.bit_size, uniform_offset, .base = nir_intrinsic_range_base(intr) / 16, .range = nir_intrinsic_range(intr) / 16, .dest_type = nir_type_float32); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
