Changeset 3f32dfd in opengl-game for vulkan-game.hpp

Timestamp:

Jan 24, 2021, 5:56:07 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

ce9dc9f

Parents:

7f60b28

git-author:

Dmitry Portnoy <dportnoy@…> (01/24/21 17:47:00)

git-committer:

Dmitry Portnoy <dportnoy@…> (01/24/21 17:56:07)

Message:

In VulkanGame, use the rewritten functions for querting swap chain capabilities, and use a separate command pool for setting up image resources

File:

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

vulkan-game.hpp

@@ -198 +198 @@
 class VulkanGame {
    public:
-      VulkanGame(int maxFramesInFlight);
+      VulkanGame();
       ~VulkanGame();
 
@@ -234 +234 @@
          void* pUserData);
 
-      // TODO: Make these consts static
-      // Also, maybe move them into consts.hpp
-
-      const int MAX_FRAMES_IN_FLIGHT;
-
       const float NEAR_CLIP = 0.1f;
       const float FAR_CLIP = 100.0f;
@@ -268 +263 @@
       VkQueue presentQueue;
 
+      // TODO: Maybe make a swapchain struct for convenience
+      VkSurfaceFormatKHR swapChainSurfaceFormat;
+      VkPresentModeKHR swapChainPresentMode;
+      VkExtent2D swapChainExtent;
+      uint32_t swapChainMinImageCount;
       uint32_t swapChainImageCount;
       VkSwapchainKHR swapChain;
       vector<VkImage> swapChainImages;
-      VkFormat swapChainImageFormat;
-      VkExtent2D swapChainExtent;
       vector<VkImageView> swapChainImageViews;
       vector<VkFramebuffer> swapChainFramebuffers;
 
       VkRenderPass renderPass;
+
+      VkCommandPool resourceCommandPool;
+
       VkCommandPool commandPool;
+      vector<VkCommandPool> commandPools; // This is not used yet, but will be once 
       vector<VkCommandBuffer> commandBuffers;
 
       VulkanImage depthImage;
 
-      vector<VkSemaphore> imageAvailableSemaphores;
-      vector<VkSemaphore> renderFinishedSemaphores;
+      // These are per frame
+      vector<VkSemaphore> imageAcquiredSemaphores;
+      vector<VkSemaphore> renderCompleteSemaphores;
+
+      // These are per swap chain image
       vector<VkFence> inFlightFences;
 
-      size_t currentFrame;
+      uint32_t imageIndex;
+      uint32_t currentFrame;
 
       bool framebufferResized;
@@ -380 +386 @@
       void initMatrices();
       void mainLoop();
-      void updateScene(uint32_t currentImage);
+      void updateScene();
       void renderScene();
       void cleanup();
@@ -392 +398 @@
       void createLogicalDevice(const vector<const char*>& validationLayers,
          const vector<const char*>& deviceExtensions);
+      void chooseSwapChainProperties();
       void createSwapChain();
       void createImageViews();
       void createRenderPass();
-      VkFormat findDepthFormat();
+      VkFormat findDepthFormat(); // TODO: Declare/define (in the cpp file) this function in some util functions section
+      void createResourceCommandPool();
       void createCommandPool();
       void createImageResources();
-
-      void createTextureSampler();
       void createFramebuffers();
       void createCommandBuffers();
       void createSyncObjects();
+
+      void createTextureSampler();
 
       void createImguiDescriptorPool();