Changeset d2d9286 in opengl-game for vulkan-game.cpp

Timestamp:

Nov 7, 2019, 2:05:17 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

f985231

Parents:

87c8f1a

Message:

In vulkangame, implement the renderScene function to draw a frame in Vulkan and implement a test UI overlay

File:

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

vulkan-game.cpp

@@ -215 +215 @@
    UIEvent e;
    bool quit = false;
-
-   SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
 
    while (!quit) {
@@ -266 +264 @@
 
 void VulkanGame::renderUI() {
+   // TODO: Since I currently don't use any other render targets,
+   // I may as well set this once before the render loop
+   SDL_SetRenderTarget(renderer, uiOverlay);
+
+   SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0x00);
    SDL_RenderClear(renderer);
-   SDL_RenderPresent(renderer);
+
+   SDL_Rect rect = {280, 220, 100, 100};
+   SDL_SetRenderDrawColor(renderer, 0x00, 0xFF, 0x00, 0xFF);
+   SDL_RenderFillRect(renderer, &rect);
+
+   SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0xFF, 0xFF);
+   SDL_RenderDrawLine(renderer, 50, 5, 150, 500);
+
+   VulkanUtils::populateVulkanImageFromSDLTexture(device, physicalDevice, commandPool, uiOverlay, renderer,
+      sdlOverlayImage, graphicsQueue);
 }
 
@@ -274 +286 @@
 
    uint32_t imageIndex;
+
+   VkResult result = vkAcquireNextImageKHR(device, swapChain, numeric_limits<uint64_t>::max(),
+      imageAvailableSemaphores[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!");
+   }
+
+   VkSubmitInfo submitInfo = {};
+   submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+
+   VkSemaphore waitSemaphores[] = { imageAvailableSemaphores[currentFrame] };
+   VkPipelineStageFlags waitStages[] = { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT };
+
+   submitInfo.waitSemaphoreCount = 1;
+   submitInfo.pWaitSemaphores = waitSemaphores;
+   submitInfo.pWaitDstStageMask = waitStages;
+   submitInfo.commandBufferCount = 1;
+   submitInfo.pCommandBuffers = &commandBuffers[imageIndex];
+
+   VkSemaphore signalSemaphores[] = { renderFinishedSemaphores[currentFrame] };
+
+   submitInfo.signalSemaphoreCount = 1;
+   submitInfo.pSignalSemaphores = signalSemaphores;
+
+   vkResetFences(device, 1, &inFlightFences[currentFrame]);
+
+   if (vkQueueSubmit(graphicsQueue, 1, &submitInfo, inFlightFences[currentFrame]) != 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;
+
+   VkSwapchainKHR swapChains[] = { swapChain };
+   presentInfo.swapchainCount = 1;
+   presentInfo.pSwapchains = swapChains;
+   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) % MAX_FRAMES_IN_FLIGHT;
@@ -774 +839 @@
       vkCmdBeginRenderPass(commandBuffers[i], &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 
-      // reateGraphicsPipelineCommands(scenePipeline, i);
-      // createGraphicsPipelineCommands(overlayPipeline, i);
       for (GraphicsPipeline_Vulkan pipeline : graphicsPipelines) {
          pipeline.createRenderCommands(commandBuffers[i], i);
@@ -809 +872 @@
 }
 
+void VulkanGame::recreateSwapChain() {
+   cout << "Recreating swap chain" << endl;
+   gui->refreshWindowSize();
+
+   while (gui->getWindowWidth() == 0 || gui->getWindowHeight() == 0 ||
+      (SDL_GetWindowFlags(window) & SDL_WINDOW_MINIMIZED) != 0) {
+      SDL_WaitEvent(nullptr);
+      gui->refreshWindowSize();
+   }
+
+   vkDeviceWaitIdle(device);
+
+   //cleanupSwapChain();
+}
+
 void VulkanGame::cleanupSwapChain() {
    VulkanUtils::destroyVulkanImage(device, depthImage);