From 0b25f596751e36e0e4fc323911921fda2f673102 Mon Sep 17 00:00:00 2001 From: Jordan Halase Date: Mon, 4 Nov 2019 21:48:18 -0600 Subject: Rename imageAcquired to presentComplete --- main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index e68790e..df5eec1 100755 --- a/main.c +++ b/main.c @@ -192,7 +192,7 @@ struct SwapchainVulkan { }; struct SemaphoreVulkan { - VkSemaphore imageAcquired; + VkSemaphore presentComplete; VkSemaphore renderFinished; }; @@ -1526,7 +1526,7 @@ int rvkCreateSyncObjects(struct RenderVulkan *vk) { VkSemaphoreCreateInfo semaphoreInfo = { 0 }; semaphoreInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; - vk->dev->vkCreateSemaphore(vk->device, &semaphoreInfo, ALLOC_VK, &vk->sync.semaphore.imageAcquired); + vk->dev->vkCreateSemaphore(vk->device, &semaphoreInfo, ALLOC_VK, &vk->sync.semaphore.presentComplete); vk->dev->vkCreateSemaphore(vk->device, &semaphoreInfo, ALLOC_VK, &vk->sync.semaphore.renderFinished); VkFenceCreateInfo fenceInfo = { 0 }; fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; @@ -1559,9 +1559,9 @@ void rvkDestroySyncObjects(struct RenderVulkan *vk) vk->dev->vkDestroySemaphore(vk->device, vk->sync.semaphore.renderFinished, ALLOC_VK); vk->sync.semaphore.renderFinished = VK_NULL_HANDLE; } - if (vk->sync.semaphore.imageAcquired) { - vk->dev->vkDestroySemaphore(vk->device, vk->sync.semaphore.imageAcquired, ALLOC_VK); - vk->sync.semaphore.imageAcquired = VK_NULL_HANDLE; + if (vk->sync.semaphore.presentComplete) { + vk->dev->vkDestroySemaphore(vk->device, vk->sync.semaphore.presentComplete, ALLOC_VK); + vk->sync.semaphore.presentComplete = VK_NULL_HANDLE; } } @@ -1676,7 +1676,7 @@ PuglStatus onDisplay(PuglView *view) vk->device, vk->swapchain.rawSwapchain, UINT64_MAX, - vk->sync.semaphore.imageAcquired, + vk->sync.semaphore.presentComplete, VK_NULL_HANDLE, &imageIndex))) { rvkSetErrMsg(vk, "Could not acquire swapchain image: %d", result); @@ -1700,7 +1700,7 @@ PuglStatus onDisplay(PuglView *view) VkSubmitInfo submitInfo = { 0 }; submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submitInfo.waitSemaphoreCount = 1; - submitInfo.pWaitSemaphores = &vk->sync.semaphore.imageAcquired; + submitInfo.pWaitSemaphores = &vk->sync.semaphore.presentComplete; submitInfo.pWaitDstStageMask = &waitStage; submitInfo.commandBufferCount = 1; submitInfo.pCommandBuffers = &vk->commandBuffers[imageIndex]; -- cgit v1.2.1