Changeset 4e2c709 in opengl-game for vulkan-game.cpp

Timestamp:

Feb 14, 2021, 2:44:21 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

28ea92f

Parents:

9c0a614

Message:

In VulkanGame, separate renderScene() into renderFrame() and presentFrame(), and in SDLGame, rename FrameRender() and FramePresent() to renderFrame() and presentFrame()

File:

• vulkan-game.cpp (modified) (3 diffs)

vulkan-game.cpp

@@ -942 +942 @@
          sdlOverlayImage, graphicsQueue);
 
-      renderScene();
+      renderFrame();
+      presentFrame();
    }
 }
@@ -1139 +1140 @@
 }
 
-// TODO: Maybe move all/most of this to the base Screen class
-void VulkanGame::renderScene() {
-   // TODO: Recreate the swap chain here if the user went to a new screen
-
-   VkResult result = vkAcquireNextImageKHR(device, swapChain, numeric_limits<uint64_t>::max(),
-      imageAcquiredSemaphores[currentFrame], VK_NULL_HANDLE, &imageIndex);
-
-   if (result == VK_ERROR_OUT_OF_DATE_KHR) {
-      recreateSwapChain();
-      return;
-   } else if (result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR) {
-      throw runtime_error("failed to acquire swap chain image!");
-   }
-
-   if (vkWaitForFences(device, 1, &inFlightFences[imageIndex], VK_TRUE, numeric_limits<uint64_t>::max()) != VK_SUCCESS) {
-      throw runtime_error("failed waiting for fence!");
-   }
-   if (vkResetFences(device, 1, &inFlightFences[imageIndex]) != VK_SUCCESS) {
-      throw runtime_error("failed to reset fence!");
-   }
-
-   updateScene();
-
-   VkSemaphore waitSemaphores[] = { imageAcquiredSemaphores[currentFrame] };
-   VkPipelineStageFlags waitStages[] = { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT };
-   VkSemaphore signalSemaphores[] = { renderCompleteSemaphores[currentFrame] };
-
-   VkSubmitInfo submitInfo = {};
-   submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
-   submitInfo.waitSemaphoreCount = 1;
-   submitInfo.pWaitSemaphores = waitSemaphores;
-   submitInfo.pWaitDstStageMask = waitStages;
-   submitInfo.commandBufferCount = 1;
-   submitInfo.pCommandBuffers = &commandBuffers[imageIndex];
-   submitInfo.signalSemaphoreCount = 1;
-   submitInfo.pSignalSemaphores = signalSemaphores;
-
-   if (vkQueueSubmit(graphicsQueue, 1, &submitInfo, inFlightFences[imageIndex]) != VK_SUCCESS) {
-      throw runtime_error("failed to submit draw command buffer!");
-   }
-
-   VkPresentInfoKHR presentInfo = {};
-   presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
-   presentInfo.waitSemaphoreCount = 1;
-   presentInfo.pWaitSemaphores = signalSemaphores;
-   presentInfo.swapchainCount = 1;
-   presentInfo.pSwapchains = &swapChain;
-   presentInfo.pImageIndices = &imageIndex;
-   presentInfo.pResults = nullptr;
-
-   result = vkQueuePresentKHR(presentQueue, &presentInfo);
-
-   if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || framebufferResized) {
-      framebufferResized = false;
-      recreateSwapChain();
-   } else if (result != VK_SUCCESS) {
-      throw runtime_error("failed to present swap chain image!");
-   }
-
-   currentFrame = (currentFrame + 1) % swapChainImageCount;
-}
-
 void VulkanGame::cleanup() {
    if (vkDeviceWaitIdle(device) != VK_SUCCESS) {
@@ -1806 +1745 @@
       }
    }
+}
+
+void VulkanGame::renderFrame() {
+   VkResult result = vkAcquireNextImageKHR(device, swapChain, numeric_limits<uint64_t>::max(),
+      imageAcquiredSemaphores[currentFrame], VK_NULL_HANDLE, &imageIndex);
+
+   if (result == VK_ERROR_OUT_OF_DATE_KHR) {
+      recreateSwapChain();
+      return;
+   } else if (result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR) {
+      throw runtime_error("failed to acquire swap chain image!");
+   }
+
+   if (vkWaitForFences(device, 1, &inFlightFences[imageIndex], VK_TRUE, numeric_limits<uint64_t>::max()) != VK_SUCCESS) {
+      throw runtime_error("failed waiting for fence!");
+   }
+   if (vkResetFences(device, 1, &inFlightFences[imageIndex]) != VK_SUCCESS) {
+      throw runtime_error("failed to reset fence!");
+   }
+
+   updateScene();
+
+   VkSemaphore waitSemaphores[] = { imageAcquiredSemaphores[currentFrame] };
+   VkPipelineStageFlags waitStages[] = { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT };
+   VkSemaphore signalSemaphores[] = { renderCompleteSemaphores[currentFrame] };
+
+   VkSubmitInfo submitInfo = {};
+   submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+   submitInfo.waitSemaphoreCount = 1;
+   submitInfo.pWaitSemaphores = waitSemaphores;
+   submitInfo.pWaitDstStageMask = waitStages;
+   submitInfo.commandBufferCount = 1;
+   submitInfo.pCommandBuffers = &commandBuffers[imageIndex];
+   submitInfo.signalSemaphoreCount = 1;
+   submitInfo.pSignalSemaphores = signalSemaphores;
+
+   if (vkQueueSubmit(graphicsQueue, 1, &submitInfo, inFlightFences[imageIndex]) != VK_SUCCESS) {
+      throw runtime_error("failed to submit draw command buffer!");
+   }
+}
+
+void VulkanGame::presentFrame() {
+   VkSemaphore signalSemaphores[] = { renderCompleteSemaphores[currentFrame] };
+
+   VkPresentInfoKHR presentInfo = {};
+   presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
+   presentInfo.waitSemaphoreCount = 1;
+   presentInfo.pWaitSemaphores = signalSemaphores;
+   presentInfo.swapchainCount = 1;
+   presentInfo.pSwapchains = &swapChain;
+   presentInfo.pImageIndices = &imageIndex;
+   presentInfo.pResults = nullptr;
+
+   VkResult result = vkQueuePresentKHR(presentQueue, &presentInfo);
+
+   if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || framebufferResized) {
+      framebufferResized = false;
+      recreateSwapChain();
+   } else if (result != VK_SUCCESS) {
+      throw runtime_error("failed to present swap chain image!");
+   }
+
+   currentFrame = (currentFrame + 1) % swapChainImageCount;
 }