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 <airlied@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12659>
This commit is contained in:
parent
a923835afc
commit
0b2b2a4783
|
@ -43,7 +43,6 @@ enum zink_heap {
|
||||||
ZINK_HEAP_DEVICE_LOCAL,
|
ZINK_HEAP_DEVICE_LOCAL,
|
||||||
ZINK_HEAP_DEVICE_LOCAL_SPARSE,
|
ZINK_HEAP_DEVICE_LOCAL_SPARSE,
|
||||||
ZINK_HEAP_DEVICE_LOCAL_VISIBLE,
|
ZINK_HEAP_DEVICE_LOCAL_VISIBLE,
|
||||||
ZINK_HEAP_HOST_VISIBLE_ANY,
|
|
||||||
ZINK_HEAP_HOST_VISIBLE_COHERENT,
|
ZINK_HEAP_HOST_VISIBLE_COHERENT,
|
||||||
ZINK_HEAP_HOST_VISIBLE_CACHED,
|
ZINK_HEAP_HOST_VISIBLE_CACHED,
|
||||||
ZINK_HEAP_MAX,
|
ZINK_HEAP_MAX,
|
||||||
|
@ -132,9 +131,6 @@ vk_domain_from_heap(enum zink_heap heap)
|
||||||
case ZINK_HEAP_DEVICE_LOCAL_VISIBLE:
|
case ZINK_HEAP_DEVICE_LOCAL_VISIBLE:
|
||||||
domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
|
domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
|
||||||
break;
|
break;
|
||||||
case ZINK_HEAP_HOST_VISIBLE_ANY:
|
|
||||||
domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
|
|
||||||
break;
|
|
||||||
case ZINK_HEAP_HOST_VISIBLE_COHERENT:
|
case ZINK_HEAP_HOST_VISIBLE_COHERENT:
|
||||||
domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
|
domains = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
|
||||||
break;
|
break;
|
||||||
|
@ -159,13 +155,10 @@ zink_heap_from_domain_flags(VkMemoryPropertyFlags domains, enum zink_alloc_flag
|
||||||
if (domains & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)
|
if (domains & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)
|
||||||
return ZINK_HEAP_DEVICE_LOCAL;
|
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)
|
if (domains & VK_MEMORY_PROPERTY_HOST_CACHED_BIT)
|
||||||
return ZINK_HEAP_HOST_VISIBLE_CACHED;
|
return ZINK_HEAP_HOST_VISIBLE_CACHED;
|
||||||
|
|
||||||
return ZINK_HEAP_HOST_VISIBLE_ANY;
|
return ZINK_HEAP_HOST_VISIBLE_COHERENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -577,7 +577,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t
|
||||||
heap = ZINK_HEAP_DEVICE_LOCAL;
|
heap = ZINK_HEAP_DEVICE_LOCAL;
|
||||||
break;
|
break;
|
||||||
case ZINK_HEAP_HOST_VISIBLE_CACHED:
|
case ZINK_HEAP_HOST_VISIBLE_CACHED:
|
||||||
heap = ZINK_HEAP_HOST_VISIBLE_ANY;
|
heap = ZINK_HEAP_HOST_VISIBLE_COHERENT;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1905,7 +1905,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
|
||||||
if (screen->heap_map[i] == UINT8_MAX) {
|
if (screen->heap_map[i] == UINT8_MAX) {
|
||||||
/* only cached mem has a failure case for now */
|
/* only cached mem has a failure case for now */
|
||||||
assert(i == ZINK_HEAP_HOST_VISIBLE_CACHED);
|
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];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue