From d23b3a13943576bbb8dd0fea12ac717c40b376e1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 31 Jan 2023 16:46:51 -0500 Subject: [PATCH] zink: fix zink_mem_type_idx_from_bits() at some point this used to work, but it no longer does what it's supposed to do, which is return a memtype from a heap+flags Fixes: d702a503ad5 ("zink: support multiple heaps per memory type") Part-of: --- src/gallium/drivers/zink/zink_bo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_bo.h b/src/gallium/drivers/zink/zink_bo.h index 42e5ec2..4677042 100644 --- a/src/gallium/drivers/zink/zink_bo.h +++ b/src/gallium/drivers/zink/zink_bo.h @@ -96,7 +96,7 @@ static inline unsigned zink_mem_type_idx_from_bits(struct zink_screen *screen, enum zink_heap heap, uint32_t bits) { for (unsigned i = 0; i < screen->heap_count[heap]; i++) { - if (bits & BITFIELD_BIT(screen->heap_map[heap][i])) { + if (bits & screen->info.mem_props.memoryTypes[screen->heap_map[heap][i]].propertyFlags) { return screen->heap_map[heap][i]; } } -- 2.7.4