From 0b2b2a4783a73fdcdac9d7957bb2f682bc78952b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 27 Aug 2021 18:09:25 -0400 Subject: [PATCH] zink: remove ZINK_HEAP_HOST_VISIBLE_ANY this was just the coherent heap but splitting the slabs more to make suballocating worse Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_bo.h | 9 +-------- src/gallium/drivers/zink/zink_resource.c | 2 +- src/gallium/drivers/zink/zink_screen.c | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/zink/zink_bo.h b/src/gallium/drivers/zink/zink_bo.h index 403e2d6de5a..a8ddb046024 100644 --- a/src/gallium/drivers/zink/zink_bo.h +++ b/src/gallium/drivers/zink/zink_bo.h @@ -43,7 +43,6 @@ enum zink_heap { ZINK_HEAP_DEVICE_LOCAL, ZINK_HEAP_DEVICE_LOCAL_SPARSE, ZINK_HEAP_DEVICE_LOCAL_VISIBLE, - ZINK_HEAP_HOST_VISIBLE_ANY, ZINK_HEAP_HOST_VISIBLE_COHERENT, ZINK_HEAP_HOST_VISIBLE_CACHED, ZINK_HEAP_MAX, @@ -132,9 +131,6 @@ vk_domain_from_heap(enum zink_heap heap) case ZINK_HEAP_DEVICE_LOCAL_VISIBLE: domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; break; - case ZINK_HEAP_HOST_VISIBLE_ANY: - domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - break; case ZINK_HEAP_HOST_VISIBLE_COHERENT: domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; break; @@ -159,13 +155,10 @@ zink_heap_from_domain_flags(VkMemoryPropertyFlags domains, enum zink_alloc_flag if (domains & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) return ZINK_HEAP_DEVICE_LOCAL; - if (domains & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) - return ZINK_HEAP_HOST_VISIBLE_COHERENT; - if (domains & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) return ZINK_HEAP_HOST_VISIBLE_CACHED; - return ZINK_HEAP_HOST_VISIBLE_ANY; + return ZINK_HEAP_HOST_VISIBLE_COHERENT; } bool diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index f1fbf954f5b..90d0e5edd38 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -577,7 +577,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t heap = ZINK_HEAP_DEVICE_LOCAL; break; case ZINK_HEAP_HOST_VISIBLE_CACHED: - heap = ZINK_HEAP_HOST_VISIBLE_ANY; + heap = ZINK_HEAP_HOST_VISIBLE_COHERENT; break; default: break; diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 7f93424d004..c99fd83bf71 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -1905,7 +1905,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config) if (screen->heap_map[i] == UINT8_MAX) { /* only cached mem has a failure case for now */ assert(i == ZINK_HEAP_HOST_VISIBLE_CACHED); - screen->heap_map[i] = screen->heap_map[ZINK_HEAP_HOST_VISIBLE_ANY]; + screen->heap_map[i] = screen->heap_map[ZINK_HEAP_HOST_VISIBLE_COHERENT]; } } {