fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panvk: Fix valhall_pack_buf_idx()

Browse source 
The descriptor lowering pass can add UBO loads to read descriptors, and
these loads already assume a nir_address_format_32bit_index_offset
format.

Bail out if we detect that case in valhall_pack_buf_idx().

Reported-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Fixes: 27beadcbdb ("panvk: Extend the shader logic to support Valhall")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Rebecca Mckeever <rebecca.mckeever@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: John Anthony <john.anthony@arm.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30969>
This commit is contained in:
Boris Brezillon 2024-09-04 15:45:39 +02:00 • committed by Marge Bot
parent 343bff7903
commit 9f094cdeaf
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/panfrost/vulkan/panvk_vX_shader.c
View file

@ -387,9 +387,15 @@ valhall_pack_buf_idx(nir_builder *b, nir_instr *instr, UNUSED void *data)
intrin->intrinsic != nir_intrinsic_load_ssbo)
return false;
b->cursor = nir_before_instr(&intrin->instr);
nir_def *index = intrin->src[0].ssa;
/* The descriptor lowering pass can add UBO loads, and those already have the
* right index format. */
if (index->num_components == 1)
return false;
b->cursor = nir_before_instr(&intrin->instr);
/* The valhall backend expects nir_address_format_32bit_index_offset,
* but address mode is nir_address_format_vec2_index_32bit_offset to allow
* us to store the array size, set and index without losing information