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

zink: fix use_reusable_pool condition

Browse source 
The code originally disabled reuse whenever a pNext was passed to
`bo_create_internal`, however code has been added before it that messed
with the pointer disabling it more often that necessary.

Rearrange code to restore the original check.

cc: mesa-stable

(cherry picked from commit 6a68542167)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39462>
This commit is contained in:
Anna Maniscalco 2025-12-17 22:27:34 +01:00 • committed by Dylan Baker
parent 0107186f1c
commit e335212d83
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -594,7 +594,7 @@
"description": "zink: fix use_reusable_pool condition",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

6
src/gallium/drivers/zink/zink_bo.c
View file

@ -255,6 +255,9 @@ bo_create_internal(struct zink_screen *screen,
struct zink_bo *bo = NULL;
bool init_pb_cache;
/* all non-suballocated bo can cache */
init_pb_cache = !pNext;
alignment = get_optimal_alignment(screen, size, alignment);
VkMemoryAllocateFlagsInfo ai;
@ -288,9 +291,6 @@ bo_create_internal(struct zink_screen *screen,
return NULL;
}
/* all non-suballocated bo can cache */
init_pb_cache = !pNext;
if (!bo)
bo = CALLOC(1, sizeof(struct zink_bo) + init_pb_cache * sizeof(struct pb_cache_entry));
if (!bo) {