diff options
| author | Lynne <dev@lynne.ee> | 2020-11-22 22:48:14 +0100 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2020-11-25 23:06:35 +0100 |
| commit | b4f9d053016fdcee85bccb98e0caa31b29dc7a05 (patch) | |
| tree | 4d2fafd5e43f9a20371034414a48f6e5182e1925 /libavutil/hwcontext_vulkan.c | |
| parent | 10b3c9b533d9beb5cff732fa57011fcb182ea17d (diff) | |
hwcontext_vulkan: add VkExternalMemoryBufferCreateInfo to imported buffers
Its a validation layer thing.
Diffstat (limited to 'libavutil/hwcontext_vulkan.c')
| -rw-r--r-- | libavutil/hwcontext_vulkan.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index ed39e7b8ea..61cca86d6e 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -3028,6 +3028,11 @@ static int vulkan_transfer_data_from_mem(AVHWFramesContext *hwfc, AVFrame *dst, size_t p_size = FFALIGN(FFABS(src->linesize[i]) * p_height, p->hprops.minImportedHostPointerAlignment); + VkExternalMemoryBufferCreateInfo create_desc = { + .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO, + .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT, + }; + VkImportMemoryHostPointerInfoEXT import_desc = { .sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT, .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT, @@ -3044,7 +3049,8 @@ static int vulkan_transfer_data_from_mem(AVHWFramesContext *hwfc, AVFrame *dst, tmp.linesize[i] = FFABS(src->linesize[i]); err = create_buf(dev_ctx, &bufs[i], p_size, p_height, &tmp.linesize[i], VK_BUFFER_USAGE_TRANSFER_SRC_BIT, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, NULL, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, + host_mapped[i] ? &create_desc : NULL, host_mapped[i] ? &import_desc : NULL); if (err) goto end; @@ -3211,6 +3217,11 @@ static int vulkan_transfer_data_to_mem(AVHWFramesContext *hwfc, AVFrame *dst, size_t p_size = FFALIGN(FFABS(dst->linesize[i]) * p_height, p->hprops.minImportedHostPointerAlignment); + VkExternalMemoryBufferCreateInfo create_desc = { + .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO, + .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT, + }; + VkImportMemoryHostPointerInfoEXT import_desc = { .sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT, .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT, @@ -3227,7 +3238,8 @@ static int vulkan_transfer_data_to_mem(AVHWFramesContext *hwfc, AVFrame *dst, tmp.linesize[i] = FFABS(dst->linesize[i]); err = create_buf(dev_ctx, &bufs[i], p_size, p_height, &tmp.linesize[i], VK_BUFFER_USAGE_TRANSFER_DST_BIT, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, NULL, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, + host_mapped[i] ? &create_desc : NULL, host_mapped[i] ? &import_desc : NULL); if (err) goto end; |