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

panfrost: fix typos in architecture detection

Browse source 
The preprocessor symbol we want is `PAN_ARCH`, not `MALI_ARCH`.

Fixes: a21ee564e2 ("pan/bi: Make texel buffers use Attribute Buffers")
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
(cherry picked from commit 3945421c17)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40752>
This commit is contained in:
Eric R. Smith 2026-03-16 18:53:15 -03:00 • committed by Eric Engestrom
parent 675c1885b6
commit 0629cbe042
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

@ -6194,7 +6194,7 @@
"description": "panfrost: fix typos in architecture detection", "description": "panfrost: fix typos in architecture detection",
"nominated": true, "nominated": true,
"nomination_type": 2, "nomination_type": 2,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "a21ee564e2051e5e6827ce333da1f85b8b828e1d", "because_sha": "a21ee564e2051e5e6827ce333da1f85b8b828e1d",
"notes": null "notes": null

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

@ -2089,7 +2089,7 @@ emit_image_bufs(struct panfrost_batch *batch, mesa_shader_stage shader,
panfrost_track_image_access(batch, shader, image); panfrost_track_image_access(batch, shader, image);
#if MALI_ARCH >= 6 #if PAN_ARCH >= 6
if (is_buffer) { if (is_buffer) {
pan_pack(bufs + (i * 2), ATTRIBUTE_BUFFER, cfg) { pan_pack(bufs + (i * 2), ATTRIBUTE_BUFFER, cfg) {
cfg.type = MALI_ATTRIBUTE_TYPE_1D; cfg.type = MALI_ATTRIBUTE_TYPE_1D;
@ -2110,7 +2110,7 @@ emit_image_bufs(struct panfrost_batch *batch, mesa_shader_stage shader,
is_buffer ? 0 : image->u.tex.level); is_buffer ? 0 : image->u.tex.level);
} }
#if MALI_ARCH <= 5 #if PAN_ARCH <= 5
if (is_buffer) { if (is_buffer) {
pan_cast_and_pack(&bufs[(i * 2) + 1], ATTRIBUTE_BUFFER_CONTINUATION_3D, pan_cast_and_pack(&bufs[(i * 2) + 1], ATTRIBUTE_BUFFER_CONTINUATION_3D,
cfg) { cfg) {