Changeset 34bdf3a in opengl-game

Timestamp:

Oct 24, 2019, 3:35:49 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

87c8f1a

Parents:

603b5bc

Message:

In vulkangame, create Vulkan synchronization objects for rendering

Files:

• main-vulkan.cpp (modified) (1 diff)
• vulkan-game.cpp (modified) (4 diffs)
• vulkan-game.hpp (modified) (4 diffs)
• vulkan-ref.cpp (modified) (9 diffs)

main-vulkan.cpp

@@ -17 +17 @@
 
 int __main(int argc, char* argv[]) {
+   const int MAX_FRAMES_IN_FLIGHT = 2;
+
    cout << "Starting Vulkan Game..." << endl;
 
-   VulkanGame game;
+   VulkanGame game(MAX_FRAMES_IN_FLIGHT);
 
    try {

vulkan-game.cpp

@@ -18 +18 @@
 };
 
-VulkanGame::VulkanGame() {
+VulkanGame::VulkanGame(int maxFramesInFlight) : MAX_FRAMES_IN_FLIGHT(maxFramesInFlight) {
    gui = nullptr;
    window = nullptr;
@@ -169 +169 @@
    graphicsPipelines.back().createDescriptorSets(swapChainImages);
 
-   createCommandBuffers();
-
    // TODO: Creating the descriptor pool and descriptor sets might need to be redone when the
    // swap chain is recreated
 
    cout << "Created " << graphicsPipelines.size() << " graphics pipelines" << endl;
+
+   createCommandBuffers();
+
+   createSyncObjects();
 }
 
@@ -250 +252 @@
    }
 
+   for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
+      vkDestroySemaphore(device, renderFinishedSemaphores[i], nullptr);
+      vkDestroySemaphore(device, imageAvailableSemaphores[i], nullptr);
+      vkDestroyFence(device, inFlightFences[i], nullptr);
+   }
+
    vkDestroyCommandPool(device, commandPool, nullptr);
    vkDestroyDevice(device, nullptr);
@@ -741 +749 @@
 }
 
+void VulkanGame::createSyncObjects() {
+   imageAvailableSemaphores.resize(MAX_FRAMES_IN_FLIGHT);
+   renderFinishedSemaphores.resize(MAX_FRAMES_IN_FLIGHT);
+   inFlightFences.resize(MAX_FRAMES_IN_FLIGHT);
+
+   VkSemaphoreCreateInfo semaphoreInfo = {};
+   semaphoreInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
+
+   VkFenceCreateInfo fenceInfo = {};
+   fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
+   fenceInfo.flags = VK_FENCE_CREATE_SIGNALED_BIT;
+
+   for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
+      if (vkCreateSemaphore(device, &semaphoreInfo, nullptr, &imageAvailableSemaphores[i]) != VK_SUCCESS ||
+            vkCreateSemaphore(device, &semaphoreInfo, nullptr, &renderFinishedSemaphores[i]) != VK_SUCCESS ||
+            vkCreateFence(device, &fenceInfo, nullptr, &inFlightFences[i]) != VK_SUCCESS) {
+         throw runtime_error("failed to create synchronization objects for a frame!");
+      }
+   }
+}
+
 void VulkanGame::cleanupSwapChain() {
    VulkanUtils::destroyVulkanImage(device, depthImage);

vulkan-game.hpp

@@ -30 +30 @@
 class VulkanGame {
    public:
-      VulkanGame();
+      VulkanGame(int maxFramesInFlight);
       ~VulkanGame();
 
@@ -36 +36 @@
 
    private:
+      const int MAX_FRAMES_IN_FLIGHT;
+
       GameGui* gui;
 
@@ -85 +87 @@
       VkDescriptorImageInfo sdlOverlayImageDescriptor;
 
+      vector<VkSemaphore> imageAvailableSemaphores;
+      vector<VkSemaphore> renderFinishedSemaphores;
+      vector<VkFence> inFlightFences;
+
       bool framebufferResized = false;
 
@@ -114 +120 @@
       void createUniformBuffers();
       void createCommandBuffers();
+      void createSyncObjects();
 
       void cleanupSwapChain();

vulkan-ref.cpp

@@ -27 +27 @@
 using namespace glm;
 
+/*** START OF REFACTORED CODE ***/
 const int SCREEN_WIDTH = 800;
 const int SCREEN_HEIGHT = 600;
@@ -32 +33 @@
 const int MAX_FRAMES_IN_FLIGHT = 2;
 
-/*** START OF REFACTORED CODE ***/
 #ifdef NDEBUG
    const bool enableValidationLayers = false;
@@ -219 +219 @@
       GraphicsPipelineInfo scenePipeline;
       GraphicsPipelineInfo overlayPipeline;
-/*** END OF REFACTORED CODE ***/
 
       vector<VkSemaphore> imageAvailableSemaphores;
       vector<VkSemaphore> renderFinishedSemaphores;
       vector<VkFence> inFlightFences;
+/*** END OF REFACTORED CODE ***/
 
       size_t currentFrame = 0;
@@ -400 +400 @@
 
          createBufferResources();
-/*** END OF REFACTORED CODE ***/
 
          createSyncObjects();
@@ -475 +474 @@
       }
 
-/*** START OF REFACTORED CODE ***/
       vector<const char*> getRequiredExtensions() {
          vector<const char*> extensions = gui->getRequiredExtensions();
@@ -1696 +1694 @@
 /*** START OF REFACTORED CODE ***/
       }
-/*** END OF REFACTORED CODE ***/
 
       void createSyncObjects() {
@@ -1718 +1715 @@
          }
       }
+/*** END OF REFACTORED CODE ***/
 
       bool addObjectToScene(GraphicsPipelineInfo& info,
@@ -1970 +1968 @@
          cleanupPipelineBuffers(scenePipeline);
          cleanupPipelineBuffers(overlayPipeline);
- /*** END OF REFACTORED CODE ***/
 
          for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
@@ -1978 +1975 @@
          }
 
-/*** START OF REFACTORED CODE ***/
          vkDestroyCommandPool(device, commandPool, nullptr);
          vkDestroyDevice(device, nullptr);