mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

vkswapper: fix semaphore usage

Browse source
This commit is contained in:
Matthew Waters 2016-01-04 16:51:26 +11:00
parent 0ee8fe193e
commit 28ad97059d
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/vulkan/vkswapper.c
View file

@ -908,7 +908,7 @@ _render_buffer_unlocked (GstVulkanSwapper * swapper,
semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
semaphore_info.pNext = NULL; semaphore_info.pNext = NULL;
semaphore_info.flags = VK_FENCE_CREATE_SIGNALED_BIT; semaphore_info.flags = 0;
if (!buffer) { if (!buffer) {
g_set_error (error, GST_VULKAN_ERROR, g_set_error (error, GST_VULKAN_ERROR,
@ -954,8 +954,8 @@ reacquire:
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL; submit_info.pNext = NULL;
submit_info.waitSemaphoreCount = 0; submit_info.waitSemaphoreCount = 1;
submit_info.pWaitSemaphores = NULL; submit_info.pWaitSemaphores = &semaphore;
submit_info.commandBufferCount = 1; submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = &cmd_data.cmd; submit_info.pCommandBuffers = &cmd_data.cmd;
submit_info.signalSemaphoreCount = 0; submit_info.signalSemaphoreCount = 0;
@ -970,8 +970,8 @@ reacquire:
present.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
present.pNext = NULL; present.pNext = NULL;
present.waitSemaphoreCount = 1; present.waitSemaphoreCount = 0;
present.pWaitSemaphores = &semaphore; present.pWaitSemaphores = NULL;
present.swapchainCount = 1; present.swapchainCount = 1;
present.pSwapchains = &swapper->swap_chain; present.pSwapchains = &swapper->swap_chain;
present.pImageIndices = &swap_idx; present.pImageIndices = &swap_idx;
@ -983,20 +983,6 @@ reacquire:
if (!_swapchain_resize (swapper, error)) if (!_swapchain_resize (swapper, error))
goto error; goto error;
vkDestroySemaphore (swapper->device->device, semaphore, NULL);
if (cmd_data.cmd)
vkFreeCommandBuffers (swapper->device->device, swapper->device->cmd_pool,
1, &cmd_data.cmd);
cmd_data.cmd = VK_NULL_HANDLE;
if (cmd_data.fence)
vkDestroyFence (swapper->device->device, cmd_data.fence, NULL);
cmd_data.fence = VK_NULL_HANDLE;
if (cmd_data.notify)
cmd_data.notify (cmd_data.data);
cmd_data.notify = VK_NULL_HANDLE;
goto reacquire;
} else if (gst_vulkan_error_to_g_error (err, error, "vkQueuePresentKHR") < 0) } else if (gst_vulkan_error_to_g_error (err, error, "vkQueuePresentKHR") < 0)
goto error; goto error;