Merge branch 'ut_fix' into 'main'

zink: fix use_reusable_pool condition (fixes ~6x slowdown in Unreal Tournament)

See merge request mesa/mesa!39008
This commit is contained in:
Anna Maniscalco 2025-12-20 00:49:21 +00:00
commit 32ff2c5f99

View file

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