diff options
| author | Lynne <dev@lynne.ee> | 2020-05-12 19:08:54 +0100 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2020-05-12 21:32:24 +0100 |
| commit | 0e39fce1e1332842f658e1b5c04ec8ef4c367fb0 (patch) | |
| tree | c02355f27b53d1da742b2b4dbe3f42f5dce8030b /libavutil | |
| parent | f0c0471075fe52ed31c46e038df4280aef5b67a1 (diff) | |
hwcontext_vulkan: update prepare_frame() for multiple semaphores when exporting
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/hwcontext_vulkan.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 6b147f0fc0..89c40cb9bf 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1244,8 +1244,6 @@ static int prepare_frame(AVHWFramesContext *hwfc, VulkanExecCtx *ectx, .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, }; - VkPipelineStageFlagBits wait_st = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; - VkSubmitInfo s_info = { .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .commandBufferCount = 1, @@ -1255,6 +1253,10 @@ static int prepare_frame(AVHWFramesContext *hwfc, VulkanExecCtx *ectx, .signalSemaphoreCount = planes, }; + VkPipelineStageFlagBits wait_st[AV_NUM_DATA_POINTERS]; + for (int i = 0; i < planes; i++) + wait_st[i] = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; + switch (pmode) { case PREP_MODE_WRITE: new_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; @@ -1270,9 +1272,9 @@ static int prepare_frame(AVHWFramesContext *hwfc, VulkanExecCtx *ectx, new_layout = VK_IMAGE_LAYOUT_GENERAL; new_access = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT; dst_qf = VK_QUEUE_FAMILY_EXTERNAL_KHR; - s_info.pWaitSemaphores = &frame->sem; - s_info.pWaitDstStageMask = &wait_st; - s_info.waitSemaphoreCount = 1; + s_info.pWaitSemaphores = frame->sem; + s_info.pWaitDstStageMask = wait_st; + s_info.waitSemaphoreCount = planes; break; } |