fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 22:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

etnaviv: fix etna_nir_lower_ubo_to_uniform pass

Browse source 
The restoring of the acutal uniform offset was wrong.

Fixes: 1837135f7c ("etnaviv: nir: add ubo lowering pass")
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Acked-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9305>
This commit is contained in:
Christian Gmeiner 2021-02-25 14:01:28 +01:00 • committed by Marge Bot
parent 8248af3070
commit 5705ecb6f4
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/etnaviv/etnaviv_nir_lower_ubo_to_uniform.c
View file

@ -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);