Changeset 28ea92f in opengl-game

Timestamp:

Feb 14, 2021, 3:12:38 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

737c26a

Parents:

4e2c709

Message:

Rename the flag for recreating the swap chain to shouldRecreateSwapChain in both VulkanGame and SDLGame

Files:

• sdl-game.cpp (modified) (6 diffs)
• sdl-game.hpp (modified) (1 diff)
• vulkan-game.cpp (modified) (3 diffs)
• vulkan-game.hpp (modified) (1 diff)

sdl-game.cpp

@@ -15 +15 @@
 
 #define IMGUI_UNLIMITED_FRAME_RATE
-
-static bool g_SwapChainRebuild = false;
 
 static void check_imgui_vk_result(VkResult res) {
@@ -172 +170 @@
 
       // Resize swap chain?
-      if (g_SwapChainRebuild) {
+      if (shouldRecreateSwapChain) {
          int width, height;
          SDL_GetWindowSize(window, &width, &height);
@@ -184 +182 @@
 
             imageIndex = 0;
-            g_SwapChainRebuild = false;
+            shouldRecreateSwapChain = false;
          }
       }
@@ -823 +821 @@
 
    if (result == VK_ERROR_OUT_OF_DATE_KHR) {
-      g_SwapChainRebuild = true;
+      shouldRecreateSwapChain = true;
       return;
-   }
-   else {
+   } else {
       VKUTIL_CHECK_RESULT(result, "failed to acquire swap chain image!");
    }
@@ -895 +892 @@
 
 void VulkanGame::presentFrame() {
-   if (g_SwapChainRebuild)
+   if (shouldRecreateSwapChain) {
       return;
+   }
 
    VkSemaphore signalSemaphores[] = { renderCompleteSemaphores[currentFrame] };
@@ -914 +912 @@
    // to framebufferResized, but not quite the same
    if (result == VK_ERROR_OUT_OF_DATE_KHR) {
-      g_SwapChainRebuild = true;
+      shouldRecreateSwapChain = true;
       return;
-   }
-   else if (result != VK_SUCCESS) {
+   } else if (result != VK_SUCCESS) {
       throw runtime_error("failed to present swap chain image!");
    }

sdl-game.hpp

@@ -86 +86 @@
       uint32_t currentFrame;
 
+      bool shouldRecreateSwapChain;
+
       // My code, but not complete. Skips creating the SDL renderer, probably because it doesn't use hardware acceleration.
       // I should try to get uncapped framerate and compare performance w/ and w/out an SDL renderer

vulkan-game.cpp

@@ -65 +65 @@
 
    this->currentFrame = 0;
-   this->framebufferResized = false;
+   shouldRecreateSwapChain = false;
 
    this->object_VP_mats = {};
@@ -812 +812 @@
             case UI_EVENT_WINDOWRESIZE:
                cout << "Window resize event detected" << endl;
-               framebufferResized = true;
+               shouldRecreateSwapChain = true;
                break;
             case UI_EVENT_KEYDOWN:
@@ -1800 +1800 @@
    VkResult result = vkQueuePresentKHR(presentQueue, &presentInfo);
 
-   if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || framebufferResized) {
-      framebufferResized = false;
+   if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || shouldRecreateSwapChain) {
+      shouldRecreateSwapChain = false;
       recreateSwapChain();
    } else if (result != VK_SUCCESS) {

vulkan-game.hpp

@@ -293 +293 @@
       uint32_t currentFrame;
 
-      bool framebufferResized;
+      bool shouldRecreateSwapChain;
 
       VkDescriptorPool imguiDescriptorPool;