History

hwcontext_vulkan: use dedicated allocation for buffers when necessary

Lynne committed 6 years ago

Commit 6bb718a1 parent 4dcb50c1 file · +28 −3Browse files

Showing the changes to libavutil (1 of 1 file). Show all

Unified · Split

libavutil/hwcontext_vulkan.c+28−3
@@ -2663,7 +2663,7 @@ static int create_buf(AVHWDeviceContext *ctx, AVBufferRef **buf, size_t imp_size · 2662 unmodified lines
2663{2663{
2664 int err;2664 int err;
2665 VkResult ret;2665 VkResult ret;
2666 VkMemoryRequirements req;2666 int use_ded_mem;
2667 AVVulkanDeviceContext *hwctx = ctx->hwctx;2667 AVVulkanDeviceContext *hwctx = ctx->hwctx;
2668 VulkanDevicePriv *p = ctx->internal->priv;2668 VulkanDevicePriv *p = ctx->internal->priv;
2669 2669
@@ -2674,6 +2674,21 @@ static int create_buf(AVHWDeviceContext *ctx, AVBufferRef **buf, size_t imp_size · 4 unmodified lines
2674 .sharingMode = VK_SHARING_MODE_EXCLUSIVE,2674 .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
2675 };2675 };
2676 2676
2677 VkBufferMemoryRequirementsInfo2 req_desc = {
2678 .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2,
2679 };
2680 VkMemoryDedicatedAllocateInfo ded_alloc = {
2681 .sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
2682 .pNext = alloc_pnext,
2683 };
2684 VkMemoryDedicatedRequirements ded_req = {
2685 .sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS,
2686 };
2687 VkMemoryRequirements2 req = {
2688 .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
2689 .pNext = &ded_req,
2690 };
2691
2677 ImageBuffer *vkbuf = av_mallocz(sizeof(*vkbuf));2692 ImageBuffer *vkbuf = av_mallocz(sizeof(*vkbuf));
2678 if (!vkbuf)2693 if (!vkbuf)
2679 return AVERROR(ENOMEM);2694 return AVERROR(ENOMEM);
@@ -2695,9 +2710,19 @@ static int create_buf(AVHWDeviceContext *ctx, AVBufferRef **buf, size_t imp_size · 15 unmodified lines
2695 return AVERROR_EXTERNAL;2710 return AVERROR_EXTERNAL;
2696 }2711 }
2697 2712
2698 vkGetBufferMemoryRequirements(hwctx->act_dev, vkbuf->buf, &req);2713 req_desc.buffer = vkbuf->buf;
2714
2715 vkGetBufferMemoryRequirements2(hwctx->act_dev, &req_desc, &req);
2716
2717 /* In case the implementation prefers/requires dedicated allocation */
2718 use_ded_mem = ded_req.prefersDedicatedAllocation |
2719 ded_req.requiresDedicatedAllocation;
2720 if (use_ded_mem)
2721 ded_alloc.buffer = vkbuf->buf;
2699 2722
2700 err = alloc_mem(ctx, &req, flags, alloc_pnext, &vkbuf->flags, &vkbuf->mem);2723 err = alloc_mem(ctx, &req.memoryRequirements, flags,
2724 use_ded_mem ? &ded_alloc : (void *)ded_alloc.pNext,
2725 &vkbuf->flags, &vkbuf->mem);
2701 if (err)2726 if (err)
2702 return err;2727 return err;
2703 2728

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t