OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: fix mem info query to be more permissive

Browse Source 
airlied was right, this was way too conservative

Fixes: ff4ba3d4a7 ("zink: support PIPE_CAP_QUERY_MEMORY_INFO")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11803>
This commit is contained in:
Mike Blumenkrantz
2021-07-09 10:17:48 -04:00
committed by Marge Bot
parent 05dc72f863
commit 73f6bff07f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/zink/zink_screen.c
View File

@@ -1625,11 +1625,11 @@ zink_query_memory_info(struct pipe_screen *pscreen, struct pipe_memory_info *inf
screen->vk.GetPhysicalDeviceMemoryProperties2(screen->pdev, &mem);
for (unsigned i = 0; i < mem.memoryProperties.memoryHeapCount; i++) {
if (mem.memoryProperties.memoryHeaps[i].flags == VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) {
if (mem.memoryProperties.memoryHeaps[i].flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) {
/* VRAM */
info->total_device_memory = mem.memoryProperties.memoryHeaps[i].size / 1024;
info->avail_device_memory = (budget.heapBudget[i] - budget.heapUsage[i]) / 1024;
} else if (mem.memoryProperties.memoryHeaps[i].flags == (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) {
} else if (mem.memoryProperties.memoryHeaps[i].flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {
/* GART */
info->total_staging_memory = mem.memoryProperties.memoryHeaps[i].size / 1024;
info->avail_staging_memory = (budget.heapBudget[i] - budget.heapUsage[i]) / 1024;
@@ -1638,12 +1638,12 @@ zink_query_memory_info(struct pipe_screen *pscreen, struct pipe_memory_info *inf
/* evictions not yet supported in vulkan */
} else {
for (unsigned i = 0; i < screen->info.mem_props.memoryHeapCount; i++) {
if (screen->info.mem_props.memoryHeaps[i].flags == VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) {
if (screen->info.mem_props.memoryHeaps[i].flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) {
/* VRAM */
info->total_device_memory = screen->info.mem_props.memoryHeaps[i].size / 1024;
/* free real estate! */
info->avail_device_memory = info->total_device_memory;
} else if (screen->info.mem_props.memoryHeaps[i].flags == (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) {
} else if (screen->info.mem_props.memoryHeaps[i].flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {
/* GART */
info->total_staging_memory = screen->info.mem_props.memoryHeaps[i].size / 1024;
/* free real estate! */