From c15b2491ec064d8bcb6252b9c35fc0c6667ecaed Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 19 Jun 2023 11:55:39 -0400 Subject: [PATCH] zink: ZINK_HEAP_HOST_VISIBLE_CACHED -> ZINK_HEAP_HOST_VISIBLE_COHERENT_CACHED all host-visible memory in zink is expected to be coherent, and this makes that expectation more explicit Part-of: --- src/gallium/drivers/zink/zink_bo.h | 4 ++-- src/gallium/drivers/zink/zink_resource.c | 2 +- src/gallium/drivers/zink/zink_screen.c | 4 ++-- src/gallium/drivers/zink/zink_types.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_bo.h b/src/gallium/drivers/zink/zink_bo.h index f03003985be..a9d1e3c6e0c 100644 --- a/src/gallium/drivers/zink/zink_bo.h +++ b/src/gallium/drivers/zink/zink_bo.h @@ -66,7 +66,7 @@ vk_domain_from_heap(enum zink_heap heap) case ZINK_HEAP_HOST_VISIBLE_COHERENT: domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; break; - case ZINK_HEAP_HOST_VISIBLE_CACHED: + case ZINK_HEAP_HOST_VISIBLE_COHERENT_CACHED: domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; break; default: @@ -88,7 +88,7 @@ zink_heap_from_domain_flags(VkMemoryPropertyFlags domains, enum zink_alloc_flag return ZINK_HEAP_DEVICE_LOCAL; if (domains & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) - return ZINK_HEAP_HOST_VISIBLE_CACHED; + return ZINK_HEAP_HOST_VISIBLE_COHERENT_CACHED; return ZINK_HEAP_HOST_VISIBLE_COHERENT; } diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index c407218e196..85731d9b0b4 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -1224,7 +1224,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t case ZINK_HEAP_DEVICE_LOCAL_VISIBLE: heap = ZINK_HEAP_DEVICE_LOCAL; break; - case ZINK_HEAP_HOST_VISIBLE_CACHED: + case ZINK_HEAP_HOST_VISIBLE_COHERENT_CACHED: heap = ZINK_HEAP_HOST_VISIBLE_COHERENT; break; default: diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 1e1f3a6e962..fb37587bab5 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -3058,9 +3058,9 @@ zink_internal_create_screen(const struct pipe_screen_config *config) /* not found: use compatible heap */ if (screen->heap_map[i][0] == UINT8_MAX) { /* only cached mem has a failure case for now */ - assert(i == ZINK_HEAP_HOST_VISIBLE_CACHED || i == ZINK_HEAP_DEVICE_LOCAL_LAZY || + assert(i == ZINK_HEAP_HOST_VISIBLE_COHERENT_CACHED || i == ZINK_HEAP_DEVICE_LOCAL_LAZY || i == ZINK_HEAP_DEVICE_LOCAL_VISIBLE); - if (i == ZINK_HEAP_HOST_VISIBLE_CACHED) { + if (i == ZINK_HEAP_HOST_VISIBLE_COHERENT_CACHED) { memcpy(screen->heap_map[i], screen->heap_map[ZINK_HEAP_HOST_VISIBLE_COHERENT], screen->heap_count[ZINK_HEAP_HOST_VISIBLE_COHERENT]); screen->heap_count[i] = screen->heap_count[ZINK_HEAP_HOST_VISIBLE_COHERENT]; } else { diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index 272c6139dec..afc5e7385d6 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -210,7 +210,7 @@ enum zink_heap { ZINK_HEAP_DEVICE_LOCAL_LAZY, ZINK_HEAP_DEVICE_LOCAL_VISIBLE, ZINK_HEAP_HOST_VISIBLE_COHERENT, - ZINK_HEAP_HOST_VISIBLE_CACHED, + ZINK_HEAP_HOST_VISIBLE_COHERENT_CACHED, ZINK_HEAP_MAX, };