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

panvk/csf: enable allow_merging_workgroups when possible
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Now that all of the additional cases are handled, we can hook up the
allow_merging_workgroups flag in panvk.

Signed-off-by: Olivia Lee <olivia.lee@collabora.com>
Reviewed-by: Caterina Shablia <caterina.shablia@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38586>
This commit is contained in:
Olivia Lee 2025-11-20 02:54:04 -08:00 • committed by Marge Bot
parent a5a3036972
commit 43b85b151b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -222,7 +222,7 @@ cmd_dispatch(struct panvk_cmd_buffer *cmdbuf, struct panvk_dispatch_info *info)
cfg.workgroup_size_x = cs->cs.local_size.x;
cfg.workgroup_size_y = cs->cs.local_size.y;
cfg.workgroup_size_z = cs->cs.local_size.z;
cfg.allow_merging_workgroups = false;
cfg.allow_merging_workgroups = cs->info.cs.allow_merging_workgroups;
}
cs_move32_to(b, cs_sr_reg32(b, COMPUTE, WG_SIZE),
wg_size.opaque[0]);

3
src/panfrost/vulkan/csf/panvk_vX_cmd_precomp.c
View file

@ -95,7 +95,8 @@ panvk_per_arch(dispatch_precomp)(struct panvk_precomp_ctx *ctx,
cfg.workgroup_size_x = shader->cs.local_size.x;
cfg.workgroup_size_y = shader->cs.local_size.y;
cfg.workgroup_size_z = shader->cs.local_size.z;
cfg.allow_merging_workgroups = false;
cfg.allow_merging_workgroups =
shader->info.cs.allow_merging_workgroups;
}
cs_move32_to(b, cs_sr_reg32(b, COMPUTE, WG_SIZE), wg_size.opaque[0]);