fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 10:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: don't overwrite push uniforms and sysvals UBO with user's UBO

Browse source 
ss->info.ubo_mask includes the push+sysval UBO so if there's a user
UBO bound at the same index as the push+sysval UBO, without this
change we end up writing a descriptor for the user UBO at that index.

Fixes: 3b3cd59f ("panfrost: Launch transform feedback shaders")

Cc: mesa-stable

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34193>
(cherry picked from commit 6948ab727f)
This commit is contained in:
Caterina Shablia 2025-04-08 18:15:00 +00:00 • committed by Eric Engestrom
parent 5ad25a98ef
commit aed66adbd2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2414,7 +2414,7 @@
"description": "panfrost: don't overwrite push uniforms and sysvals UBO with user's UBO",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "3b3cd59fb85b5b200acce45f950869eb9d7b69a6",
"notes": null

4
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -1459,8 +1459,8 @@ panfrost_emit_const_buf(struct panfrost_batch *batch,
panfrost_emit_ubo(ubos.cpu, ubo_count, transfer.gpu, sys_size);
/* The rest are honest-to-goodness UBOs */
u_foreach_bit(ubo, ss->info.ubo_mask & buf->enabled_mask) {
unsigned user_ubo_mask = ss->info.ubo_mask & BITFIELD_MASK(ubo_count);
u_foreach_bit(ubo, user_ubo_mask & buf->enabled_mask) {
size_t usz = buf->cb[ubo].buffer_size;
uint64_t address = 0;