RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavu/vulkan: fix handle type for 32-bit targets 

Fixes compilation with clang which errors out on Wint-conversion.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Kacper Michajłow 2023-03-02 17:27:30 +01:00 committed by Martin Storsjö
parent f9620d74cd
commit cc76e8340d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/hwcontext_vulkan.c
View File

@ -1149,7 +1149,7 @@ static void free_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)
av_freep(&cmd->queues); av_freep(&cmd->queues);
av_freep(&cmd->bufs); av_freep(&cmd->bufs);
cmd->pool = NULL; cmd->pool = VK_NULL_HANDLE;
} }
static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd) static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)

4
libavutil/vulkan.h
View File

@ -122,7 +122,11 @@ typedef struct FFVulkanPipeline {
VkDescriptorSetLayout *desc_layout; VkDescriptorSetLayout *desc_layout;
VkDescriptorPool desc_pool; VkDescriptorPool desc_pool;
VkDescriptorSet *desc_set; VkDescriptorSet *desc_set;
#if VK_USE_64_BIT_PTR_DEFINES == 1
void **desc_staging; void **desc_staging;
#else
uint64_t *desc_staging;
#endif
VkDescriptorSetLayoutBinding **desc_binding; VkDescriptorSetLayoutBinding **desc_binding;
VkDescriptorUpdateTemplate *desc_template; VkDescriptorUpdateTemplate *desc_template;
int *desc_set_initialized; int *desc_set_initialized;