Changeset 996dd3e in opengl-game for vulkan-game.hpp

Timestamp:

May 14, 2021, 1:09:34 AM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

a3cefaa

Parents:

9d21aac

Message:

Completely remove storage buffers from the GraphicsPipeline_Vulkan class and start moving storage buffer operations out of the addObject() and updateObject() functions

File:

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

vulkan-game.hpp

@@ -96 +96 @@
    alignas(16) mat4 proj;
    alignas(4) float cur_time;
+};
+
+// TODO: Use this struct for uniform buffers as well and probably combine it with the VulkanBuffer class
+// Also, probably better to make this a vector of structs where each struct
+// has a VkBuffer, VkDeviceMemory, and VkDescriptorBufferInfo
+struct StorageBufferSet {
+   vector<VkBuffer> buffers;
+   vector<VkDeviceMemory> memory;
+   vector<VkDescriptorBufferInfo> infoSet;
 };
 
@@ -305 +314 @@
       GraphicsPipeline_Vulkan<LaserVertex> laserPipeline;
       GraphicsPipeline_Vulkan<ExplosionVertex> explosionPipeline;
+
+      StorageBufferSet storageBuffers_modelPipeline;
+      StorageBufferSet storageBuffers_shipPipeline;
+      StorageBufferSet storageBuffers_asteroidPipeline;
+      StorageBufferSet storageBuffers_laserPipeline;
+      StorageBufferSet storageBuffers_explosionPipeline;
 
       // TODO: Maybe make the ubo objects part of the pipeline class since there's only one ubo
@@ -440 +455 @@
                                                    GraphicsPipeline_Vulkan<VertexType>& pipeline,
                                                    const vector<VertexType>& vertices, vector<uint16_t> indices,
-                                                   SSBOType ssbo, bool pipelinesCreated);
+                                                   SSBOType ssbo, StorageBufferSet& storageBuffers,
+                                                   bool pipelinesCreated);
 
       template<class VertexType>
@@ -544 +560 @@
                                                          GraphicsPipeline_Vulkan<VertexType>& pipeline,
                                                          const vector<VertexType>& vertices, vector<uint16_t> indices,
-                                                         SSBOType ssbo, bool pipelinesCreated) {
+                                                         SSBOType ssbo, StorageBufferSet& storageBuffers,
+                                                         bool pipelinesCreated) {
    // 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
@@ -566 +583 @@
    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>(pipeline.storageBufferSet, resourceCommandPool, graphicsQueue, pipeline);
+      resizeStorageBufferSet<VertexType, SSBOType>(storageBuffers, resourceCommandPool, graphicsQueue, pipeline);
       pipeline.cleanup();
 
       // Assume the SSBO is always the 2nd binding
-      pipeline.updateDescriptorInfo(1, &pipeline.storageBufferSet.infoSet);
+      // TODO: Figure out a way to make this more flexible
+      pipeline.updateDescriptorInfo(1, &storageBuffers.infoSet);
    }
 
    pipeline.numObjects++;
-
-   updateStorageBuffer(pipeline.storageBufferSet, pipeline.numObjects - 1, obj.ssbo);
 
    // TODO: Figure out why I am destroying and recreating the ubos when the swap chain is recreated,
@@ -584 +602 @@
 
    if (pipelinesCreated) {
+      // TODO: See if I can avoid doing this when recreating the pipeline
       vkDeviceWaitIdle(device);
 
@@ -699 +718 @@
    obj.center = vec3(obj.ssbo.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
 
-   updateStorageBuffer(pipeline.storageBufferSet, index, obj.ssbo);
-
    obj.modified = false;
 }