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

panvk/jm: Fix tls_size overwrite in indirect draws

Browse source 
Only caused problems when the VS/FS has more TLS than our internal shaders
that doesn't usually happen but will cause bugs when we start to
compress local memory.

Fixes: 005703e5b5 ("panvk: Move TLS preparation logic to cmd_dispatch_prepare_tls")
Signed-off-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
(cherry picked from commit f0d2ad9840)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41402>
This commit is contained in:
Lorenzo Rossi 2026-04-30 13:14:57 +02:00 • committed by Eric Engestrom
parent 9353a223aa
commit d24a306681
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2394,7 +2394,7 @@
"description": "panvk/jm: Fix tls_size overwrite in indirect draws",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "005703e5b5f1b20903185d2f3f958e3f0aa4cbc4",
"notes": null

2
src/panfrost/vulkan/jm/panvk_vX_cmd_dispatch.c
View file

@ -44,7 +44,7 @@ panvk_per_arch(cmd_dispatch_prepare_tls)(
panvk_per_arch(cmd_alloc_tls_desc)(cmdbuf, false);
batch->tlsinfo.tls.size = cs->info.tls_size;
batch->tlsinfo.tls.size = MAX2(cs->info.tls_size, batch->tlsinfo.tls.size);
batch->tlsinfo.wls.size = cs->info.wls_size;
if (batch->tlsinfo.wls.size) {