virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi/vulkan: use dedicated allocation for buffers when necessary

Browse Source
This commit is contained in:
Lynne 2020-05-25 15:36:41 +01:00
parent bf056caf54
commit fb49d5c0b1
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavfilter/vulkan.c
View File

@ -152,7 +152,7 @@ int ff_vk_create_buf(AVFilterContext *avctx, FFVkBuffer *buf, size_t size,
{ {
int err; int err;
VkResult ret; VkResult ret;
VkMemoryRequirements req; int use_ded_mem;
VulkanFilterContext *s = avctx->priv; VulkanFilterContext *s = avctx->priv;
VkBufferCreateInfo buf_spawn = { VkBufferCreateInfo buf_spawn = {
@ -164,6 +164,21 @@ int ff_vk_create_buf(AVFilterContext *avctx, FFVkBuffer *buf, size_t size,
but should be ok */ but should be ok */
}; };
VkBufferMemoryRequirementsInfo2 req_desc = {
.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2,
};
VkMemoryDedicatedAllocateInfo ded_alloc = {
.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
.pNext = NULL,
};
VkMemoryDedicatedRequirements ded_req = {
.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS,
};
VkMemoryRequirements2 req = {
.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
.pNext = &ded_req,
};
ret = vkCreateBuffer(s->hwctx->act_dev, &buf_spawn, NULL, &buf->buf); ret = vkCreateBuffer(s->hwctx->act_dev, &buf_spawn, NULL, &buf->buf);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Failed to create buffer: %s\n", av_log(avctx, AV_LOG_ERROR, "Failed to create buffer: %s\n",
@ -171,9 +186,19 @@ int ff_vk_create_buf(AVFilterContext *avctx, FFVkBuffer *buf, size_t size,
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} }
vkGetBufferMemoryRequirements(s->hwctx->act_dev, buf->buf, &req); req_desc.buffer = buf->buf;
err = vk_alloc_mem(avctx, &req, flags, NULL, &buf->flags, &buf->mem); vkGetBufferMemoryRequirements2(s->hwctx->act_dev, &req_desc, &req);
/* In case the implementation prefers/requires dedicated allocation */
use_ded_mem = ded_req.prefersDedicatedAllocation |
ded_req.requiresDedicatedAllocation;
if (use_ded_mem)
ded_alloc.buffer = buf->buf;
err = vk_alloc_mem(avctx, &req.memoryRequirements, flags,
use_ded_mem ? &ded_alloc : (void *)ded_alloc.pNext,
&buf->flags, &buf->mem);
if (err) if (err)
return err; return err;