[FFmpeg-devel] [PATCH 55/97] Vulkan patchset part 2 - hwcontext rewrite and filtering

Anton Khirnov anton at khirnov.net
Thu May 11 19:21:57 EEST 2023


Quoting Lynne (2023-04-24 17:56:38)
> From e20962a956444224b34d82f9a5936fae7e43bdf6 Mon Sep 17 00:00:00 2001
> From: Lynne <dev at lynne.ee>
> Date: Thu, 15 Dec 2022 17:43:27 +0100
> Subject: [PATCH 47/97] vulkan: allow alloc pNext in ff_vk_create_buf
> 
> ---
>  libavutil/vulkan.c | 5 +++--
>  libavutil/vulkan.h | 3 ++-
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
> index b1553c6537..0bb5b1eebf 100644
> --- a/libavutil/vulkan.c
> +++ b/libavutil/vulkan.c
> @@ -232,7 +232,8 @@ int ff_vk_alloc_mem(FFVulkanContext *s, VkMemoryRequirements *req,
>      return 0;
>  }
>  
> -int ff_vk_create_buf(FFVulkanContext *s, FFVkBuffer *buf, size_t size, void *pNext,
> +int ff_vk_create_buf(FFVulkanContext *s, FFVkBuffer *buf, size_t size,
> +                     void *pNext, void *alloc_pNext,
>                       VkBufferUsageFlags usage, VkMemoryPropertyFlagBits flags)
>  {
>      int err;
> @@ -254,7 +255,7 @@ int ff_vk_create_buf(FFVulkanContext *s, FFVkBuffer *buf, size_t size, void *pNe
>      };
>      VkMemoryDedicatedAllocateInfo ded_alloc = {
>          .sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
> -        .pNext = NULL,
> +        .pNext = alloc_pNext,
>      };
>      VkMemoryDedicatedRequirements ded_req = {
>          .sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS,
> diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
> index 85836a7807..d75be26977 100644
> --- a/libavutil/vulkan.h
> +++ b/libavutil/vulkan.h
> @@ -413,7 +413,8 @@ int ff_vk_submit_exec_queue(FFVulkanContext *s, FFVkExecContext *e);
>  /**
>   * Create a VkBuffer with the specified parameters.
>   */
> -int ff_vk_create_buf(FFVulkanContext *s, FFVkBuffer *buf, size_t size, void *pNext,
> +int ff_vk_create_buf(FFVulkanContext *s, FFVkBuffer *buf, size_t size,
> +                     void *pNext, void *alloc_pNext,
>                       VkBufferUsageFlags usage, VkMemoryPropertyFlagBits flags);

Shouldn't you be updating all the callers of this function here?

-- 
Anton Khirnov


More information about the ffmpeg-devel mailing list