From: Jean-Philippe Bruyère Date: Thu, 5 Sep 2019 14:29:09 +0000 (+0200) Subject: add semaphore param to presenter_acquireNextImage X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=dd13cd6f6dcf94420f0919a2ca2837739cb46ea1;p=jp%2Fvkhelpers.git add semaphore param to presenter_acquireNextImage --- diff --git a/include/vkh.h b/include/vkh.h index ef4ef4d..a171c01 100644 --- a/include/vkh.h +++ b/include/vkh.h @@ -94,7 +94,7 @@ VkhPresenter vkh_presenter_create (VkhDevice dev, uint32_t presentQueueFamIdx, V VkFormat preferedFormat, VkPresentModeKHR presentMode); void vkh_presenter_destroy (VkhPresenter r); bool vkh_presenter_draw (VkhPresenter r); -bool vkh_presenter_acquireNextImage (VkhPresenter r, VkFence fence); +bool vkh_presenter_acquireNextImage (VkhPresenter r, VkFence fence, VkSemaphore semaphore); void vkh_presenter_build_blit_cmd (VkhPresenter r, VkImage blitSource, uint32_t width, uint32_t height); void vkh_presenter_create_swapchain (VkhPresenter r); /************ diff --git a/src/vkh_presenter.c b/src/vkh_presenter.c index 8826fc0..b305c42 100644 --- a/src/vkh_presenter.c +++ b/src/vkh_presenter.c @@ -69,16 +69,16 @@ void vkh_presenter_destroy (VkhPresenter r) { free (r); } -bool vkh_presenter_acquireNextImage (VkhPresenter r, VkFence fence) { +bool vkh_presenter_acquireNextImage (VkhPresenter r, VkFence fence, VkSemaphore semaphore) { // Get the index of the next available swapchain image: VkResult err = vkAcquireNextImageKHR - (r->dev->dev, r->swapChain, UINT64_MAX, r->semaPresentEnd, fence, &r->currentScBufferIndex); + (r->dev->dev, r->swapChain, UINT64_MAX, semaphore, fence, &r->currentScBufferIndex); return ((err != VK_ERROR_OUT_OF_DATE_KHR) && (err != VK_SUBOPTIMAL_KHR)); } bool vkh_presenter_draw (VkhPresenter r) { - if (!vkh_presenter_acquireNextImage (r, VK_NULL_HANDLE)){ + if (!vkh_presenter_acquireNextImage (r, VK_NULL_HANDLE, r->semaPresentEnd)){ vkh_presenter_create_swapchain (r); return false; }