highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: support ignoring memory properties when allocating

Browse Source
This commit is contained in:
Lynne
2022-11-29 00:43:19 +00:00
parent 3c2f43d8ee
commit af48790465
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/vulkan.c
View File

@@ -188,7 +188,7 @@ int ff_vk_alloc_mem(FFVulkanContext *s, VkMemoryRequirements *req,
}; };
/* Align if we need to */ /* Align if we need to */
if (req_flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) if ((req_flags != UINT32_MAX) && req_flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)
req->size = FFALIGN(req->size, s->props.limits.minMemoryMapAlignment); req->size = FFALIGN(req->size, s->props.limits.minMemoryMapAlignment);
alloc_info.allocationSize = req->size; alloc_info.allocationSize = req->size;
@@ -201,7 +201,8 @@ int ff_vk_alloc_mem(FFVulkanContext *s, VkMemoryRequirements *req,
continue; continue;
/* The memory type flags must include our properties */ /* The memory type flags must include our properties */
if ((s->mprops.memoryTypes[i].propertyFlags & req_flags) != req_flags) if ((req_flags != UINT32_MAX) &&
((s->mprops.memoryTypes[i].propertyFlags & req_flags) != req_flags))
continue; continue;
/* Found a suitable memory type */ /* Found a suitable memory type */
@@ -210,7 +211,7 @@ int ff_vk_alloc_mem(FFVulkanContext *s, VkMemoryRequirements *req,
} }
if (index < 0) { if (index < 0) {
av_log(s, AV_LOG_ERROR, "No memory type found for flags 0x%x\n", av_log(s->device, AV_LOG_ERROR, "No memory type found for flags 0x%x\n",
req_flags); req_flags);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }