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

zink: check for dedicated allocation requirements during image alloc

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11958>
This commit is contained in:
Mike Blumenkrantz
2021-07-19 11:33:04 -04:00
committed by Marge Bot
parent bda26dfcfc
commit e9516a4edd
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/zink/zink_device_info.py
View File

@@ -71,6 +71,7 @@ EXTENSIONS = [
properties=True, properties=True,
conditions=["$feats.provokingVertexLast"]), conditions=["$feats.provokingVertexLast"]),
Extension("VK_EXT_shader_viewport_index_layer"), Extension("VK_EXT_shader_viewport_index_layer"),
Extension("VK_KHR_get_memory_requirements2"),
Extension("VK_EXT_post_depth_coverage"), Extension("VK_EXT_post_depth_coverage"),
Extension("VK_KHR_driver_properties", Extension("VK_KHR_driver_properties",
alias="driver", alias="driver",

19
src/gallium/drivers/zink/zink_resource.c
View File

@@ -509,6 +509,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t
VkMemoryRequirements reqs = {0}; VkMemoryRequirements reqs = {0};
VkMemoryPropertyFlags flags; VkMemoryPropertyFlags flags;
bool need_dedicated = false;
/* TODO: remove linear for wsi */ /* TODO: remove linear for wsi */
bool scanout = (templ->bind & (PIPE_BIND_SCANOUT | PIPE_BIND_LINEAR)) == (PIPE_BIND_SCANOUT | PIPE_BIND_LINEAR); bool scanout = (templ->bind & (PIPE_BIND_SCANOUT | PIPE_BIND_LINEAR)) == (PIPE_BIND_SCANOUT | PIPE_BIND_LINEAR);
bool shared = (templ->bind & (PIPE_BIND_SHARED | PIPE_BIND_LINEAR)) == (PIPE_BIND_SHARED | PIPE_BIND_LINEAR); bool shared = (templ->bind & (PIPE_BIND_SHARED | PIPE_BIND_LINEAR)) == (PIPE_BIND_SHARED | PIPE_BIND_LINEAR);
@@ -615,7 +616,23 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t
goto fail1; goto fail1;
} }
vkGetImageMemoryRequirements(screen->dev, obj->image, &reqs); if (screen->vk.GetImageMemoryRequirements2) {
VkMemoryRequirements2 req2;
req2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2;
VkImageMemoryRequirementsInfo2 info2;
info2.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2;
info2.pNext = NULL;
info2.image = obj->image;
VkMemoryDedicatedRequirements ded;
ded.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS;
ded.pNext = NULL;
req2.pNext = &ded;
screen->vk.GetImageMemoryRequirements2(screen->dev, &info2, &req2);
memcpy(&reqs, &req2.memoryRequirements, sizeof(VkMemoryRequirements));
need_dedicated = ded.prefersDedicatedAllocation || ded.requiresDedicatedAllocation;
} else {
vkGetImageMemoryRequirements(screen->dev, obj->image, &reqs);
}
if (templ->usage == PIPE_USAGE_STAGING && ici.tiling == VK_IMAGE_TILING_LINEAR) if (templ->usage == PIPE_USAGE_STAGING && ici.tiling == VK_IMAGE_TILING_LINEAR)
flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
else else