Module: Mesa Branch: main Commit: 5a40190f04a590d596ad9dcca0b8fa4a827e486f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a40190f04a590d596ad9dcca0b8fa4a827e486f
Author: Mike Blumenkrantz <[email protected]> Date: Thu Feb 2 11:15:18 2023 -0500 Revert "zink: fix zink_mem_type_idx_from_bits()" This reverts commit f7796997964bb462bcbfa6b9faca5dcf04b64e1b. I was doing too much F2F and not enough thinking with this one Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21076> --- 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 46770427f77..42e5ec22563 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 & screen->info.mem_props.memoryTypes[screen->heap_map[heap][i]].propertyFlags) { + if (bits & BITFIELD_BIT(screen->heap_map[heap][i])) { return screen->heap_map[heap][i]; } }
