Changeset a3cefaa in opengl-game for vulkan-game.hpp

Timestamp:

May 17, 2021, 4:06:33 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

1abebc1

Parents:

996dd3e

Message:

Move SSBO resizing and pipeline recreation checks out of addObject() and into updateScene() so that those operations are only done at most once per pipeline per frame, using vkUpdateDescriptorSets() instead of recreating the whole graphics pipeline, and create a VulkanBuffer class for managing data related to uniform buffers and shader storage buffers, move objectCapacity and numObjects out of GraphicsPipeline_vulkan and use VulkanBuffer to manage them instead

File:

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

vulkan-game.hpp

@@ -22 +22 @@
 
 #include "consts.hpp"
+#include "utils.hpp"
+#include "vulkan-utils.hpp"
+#include "vulkan-buffer.hpp"
 #include "graphics-pipeline_vulkan.hpp"
 #include "game-gui-sdl.hpp"
-#include "utils.hpp"
-#include "vulkan-utils.hpp"
 
 using namespace glm;
@@ -101 +102 @@
 // Also, probably better to make this a vector of structs where each struct
 // has a VkBuffer, VkDeviceMemory, and VkDescriptorBufferInfo
+// TODO: Maybe change the structure here since VkDescriptorBufferInfo already stores a reference to the VkBuffer
 struct StorageBufferSet {
    vector<VkBuffer> buffers;
@@ -316 +318 @@
 
       StorageBufferSet storageBuffers_modelPipeline;
+      VulkanBuffer<SSBO_ModelObject> objects_modelPipeline;
+
       StorageBufferSet storageBuffers_shipPipeline;
+      VulkanBuffer<SSBO_ModelObject> objects_shipPipeline;
+
       StorageBufferSet storageBuffers_asteroidPipeline;
+      VulkanBuffer<SSBO_Asteroid> objects_asteroidPipeline;
+
       StorageBufferSet storageBuffers_laserPipeline;
+      VulkanBuffer<SSBO_Laser> objects_laserPipeline;
+
       StorageBufferSet storageBuffers_explosionPipeline;
+      VulkanBuffer<SSBO_Explosion> objects_explosionPipeline;
 
       // TODO: Maybe make the ubo objects part of the pipeline class since there's only one ubo
@@ -443 +454 @@
       // TODO: Remove the need for templating, which is only there so a GraphicsPupeline_Vulkan can be passed in
       template<class VertexType, class SSBOType>
-      void resizeStorageBufferSet(StorageBufferSet& set, VkCommandPool commandPool, VkQueue graphicsQueue,
-                                  GraphicsPipeline_Vulkan<VertexType>& pipeline);
+      void resizeStorageBufferSet(StorageBufferSet& set, VulkanBuffer<SSBOType>& buffer,
+                                  GraphicsPipeline_Vulkan<VertexType>& pipeline,
+                                  VkCommandPool commandPool, VkQueue graphicsQueue);
 
       template<class SSBOType>
@@ -455 +467 @@
                                                    GraphicsPipeline_Vulkan<VertexType>& pipeline,
                                                    const vector<VertexType>& vertices, vector<uint16_t> indices,
-                                                   SSBOType ssbo, StorageBufferSet& storageBuffers,
-                                                   bool pipelinesCreated);
+                                                   SSBOType ssbo, StorageBufferSet& storageBuffers);
 
       template<class VertexType>
@@ -511 +522 @@
 
 template<class VertexType, class SSBOType>
-void VulkanGame::resizeStorageBufferSet(StorageBufferSet& set, VkCommandPool commandPool, VkQueue graphicsQueue,
-                                        GraphicsPipeline_Vulkan<VertexType>& pipeline) {
-   pipeline.objectCapacity *= 2;
-   VkDeviceSize bufferSize = pipeline.objectCapacity * sizeof(SSBOType);
+void VulkanGame::resizeStorageBufferSet(StorageBufferSet& set, VulkanBuffer<SSBOType>& buffer,
+                                        GraphicsPipeline_Vulkan<VertexType>& pipeline,
+                                        VkCommandPool commandPool, VkQueue graphicsQueue) {
+   size_t numObjects = buffer.numObjects < buffer.capacity ? buffer.numObjects : buffer.capacity;
+
+   do {
+      buffer.capacity *= 2;
+   } while (buffer.capacity < buffer.numObjects);
+
+   VkDeviceSize bufferSize = buffer.capacity * sizeof(SSBOType);
 
    for (size_t i = 0; i < set.buffers.size(); i++) {
@@ -526 +543 @@
 
       VulkanUtils::copyBuffer(device, commandPool, set.buffers[i], newStorageBuffer,
-         0, 0, pipeline.numObjects * sizeof(SSBOType), graphicsQueue);
+         0, 0, numObjects * sizeof(SSBOType), graphicsQueue);
 
       vkDestroyBuffer(device, set.buffers[i], nullptr);
@@ -538 +555 @@
       set.infoSet[i].range = bufferSize; // Size of the update starting from offset, or VK_WHOLE_SIZE
    }
+
+   // Assume the SSBO is always the 2nd binding
+   // TODO: Figure out a way to make this more flexible
+   pipeline.updateDescriptorInfo(1, &set.infoSet, swapChainImages);
 }
 
@@ -551 +572 @@
 // and to change the model matrix later by setting model_transform and then calling updateObject()
 // Figure out a better way to allow the model matrix to be set during object creation
-
-// TODO: Maybe return a reference to the object from this method if I decide that updating it
-// immediately after creation is a good idea (such as setting model_base)
-// Currently, model_base is set like this in a few places and the radius is set for asteroids
-// to account for scaling
 template<class VertexType, class SSBOType>
 SceneObject<VertexType, SSBOType>& VulkanGame::addObject(vector<SceneObject<VertexType, SSBOType>>& objects,
                                                          GraphicsPipeline_Vulkan<VertexType>& pipeline,
                                                          const vector<VertexType>& vertices, vector<uint16_t> indices,
-                                                         SSBOType ssbo, StorageBufferSet& storageBuffers,
-                                                         bool pipelinesCreated) {
+                                                         SSBOType ssbo, StorageBufferSet& storageBuffers) {
    // TODO: Use the model field of ssbo to set the object's model_base
    // currently, the passed in model is useless since it gets overridden in updateObject() anyway
@@ -582 +597 @@
 
    pipeline.addObject(obj.vertices, obj.indices, resourceCommandPool, graphicsQueue);
-
-   // TODO: Probably move the resizing to the VulkanBuffer class
-   // First, try moving this out of addObject
-   bool resizeStorageBuffer = pipeline.numObjects == pipeline.objectCapacity;
-
-   if (resizeStorageBuffer) {
-      resizeStorageBufferSet<VertexType, SSBOType>(storageBuffers, resourceCommandPool, graphicsQueue, pipeline);
-      pipeline.cleanup();
-
-      // Assume the SSBO is always the 2nd binding
-      // TODO: Figure out a way to make this more flexible
-      pipeline.updateDescriptorInfo(1, &storageBuffers.infoSet);
-   }
-
-   pipeline.numObjects++;
-
-   // TODO: Figure out why I am destroying and recreating the ubos when the swap chain is recreated,
-   // but am reusing the same ssbos. Maybe I don't need to recreate the ubos.
-
-   if (pipelinesCreated) {
-      // TODO: See if I can avoid doing this when recreating the pipeline
-      vkDeviceWaitIdle(device);
-
-      for (uint32_t i = 0; i < swapChainImageCount; i++) {
-         vkFreeCommandBuffers(device, commandPools[i], 1, &commandBuffers[i]);
-      }
-
-      // TODO: The pipeline recreation only has to be done once per frame where at least
-      // one SSBO is resized.
-      // Refactor the logic to check for any resized SSBOs after all objects for the frame
-      // are created and then recreate each of the corresponding pipelines only once per frame
-
-      // TODO: Also, verify if I actually need to recreate all of these, or maybe just the descriptor sets, for instance
-
-      if (resizeStorageBuffer) {
-         pipeline.createPipeline(pipeline.vertShaderFile, pipeline.fragShaderFile);
-         pipeline.createDescriptorPool(swapChainImages);
-         pipeline.createDescriptorSets(swapChainImages);
-      }
-
-      createCommandBuffers();
-   }
 
    return obj;