mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 10:14:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

panvk: improve VK_QUEUE_FAMILY_EXTERNAL support

Browse Source 
The spec says that the user-specified srcStageMask/srcAccessMask should
be ignored for the acquire operation and the user-specified
dstStageMask/dstAccessMask should be ignored for the release operation.

Since we don't need any special handling for VK_QUEUE_FAMILY_EXTERNAL,
override them to NONE.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32164>
This commit is contained in:
Chia-I Wu 2024-11-15 10:49:51 -08:00 committed by Marge Bot
parent 9e90e50362
commit 715d6e740a
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c
View File

@ -434,8 +434,31 @@ collect_cs_deps(struct panvk_cmd_buffer *cmdbuf,
static void
normalize_dependency(VkPipelineStageFlags2 *src_stages,
VkPipelineStageFlags2 *dst_stages,
VkAccessFlags2 *src_access, VkAccessFlags2 *dst_access)
VkAccessFlags2 *src_access, VkAccessFlags2 *dst_access,
uint32_t src_qfi, uint32_t dst_qfi)
{
/* queue family acquire operation */
switch (src_qfi) {
case VK_QUEUE_FAMILY_EXTERNAL:
/* no execution dependency and no availability operation */
*src_stages = VK_PIPELINE_STAGE_2_NONE;
*src_access = VK_ACCESS_2_NONE;
break;
default:
break;
}
/* queue family release operation */
switch (dst_qfi) {
case VK_QUEUE_FAMILY_EXTERNAL:
/* no execution dependency and no visibility operation */
*dst_stages = VK_PIPELINE_STAGE_2_NONE;
*dst_access = VK_ACCESS_2_NONE;
break;
default:
break;
}
*src_stages = vk_expand_pipeline_stage_flags2(*src_stages);
*dst_stages = vk_expand_pipeline_stage_flags2(*dst_stages);
@ -456,7 +479,8 @@ panvk_per_arch(get_cs_deps)(struct panvk_cmd_buffer *cmdbuf,
VkPipelineStageFlags2 dst_stages = barrier->dstStageMask;
VkAccessFlags2 src_access = barrier->srcAccessMask;
VkAccessFlags2 dst_access = barrier->dstAccessMask;
normalize_dependency(&src_stages, &dst_stages, &src_access, &dst_access);
normalize_dependency(&src_stages, &dst_stages, &src_access, &dst_access,
VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED);
collect_cs_deps(cmdbuf, src_stages, dst_stages, src_access, dst_access,
out);
@ -468,7 +492,9 @@ panvk_per_arch(get_cs_deps)(struct panvk_cmd_buffer *cmdbuf,
VkPipelineStageFlags2 dst_stages = barrier->dstStageMask;
VkAccessFlags2 src_access = barrier->srcAccessMask;
VkAccessFlags2 dst_access = barrier->dstAccessMask;
normalize_dependency(&src_stages, &dst_stages, &src_access, &dst_access);
normalize_dependency(&src_stages, &dst_stages, &src_access, &dst_access,
barrier->srcQueueFamilyIndex,
barrier->dstQueueFamilyIndex);
collect_cs_deps(cmdbuf, src_stages, dst_stages, src_access, dst_access,
out);
@ -480,7 +506,9 @@ panvk_per_arch(get_cs_deps)(struct panvk_cmd_buffer *cmdbuf,
VkPipelineStageFlags2 dst_stages = barrier->dstStageMask;
VkAccessFlags2 src_access = barrier->srcAccessMask;
VkAccessFlags2 dst_access = barrier->dstAccessMask;
normalize_dependency(&src_stages, &dst_stages, &src_access, &dst_access);
normalize_dependency(&src_stages, &dst_stages, &src_access, &dst_access,
barrier->srcQueueFamilyIndex,
barrier->dstQueueFamilyIndex);
collect_cs_deps(cmdbuf, src_stages, dst_stages, src_access, dst_access,
out);