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

Timestamp:

May 19, 2021, 7:16:37 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

58453c3

Parents:

1abebc1

git-author:

Dmitry Portnoy <dportnoy@…> (05/19/21 19:16:33)

git-committer:

Dmitry Portnoy <dportnoy@…> (05/19/21 19:16:37)

Message:

Use BufferSet objects to store data related to uniform and storage
buffers, and change createBufferSet() to take a BufferSet objects
instead of lists of buffers, memory, and descriptor info.

File:

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

vulkan-game.hpp

@@ -319 +319 @@
       BufferSet storageBuffers_modelPipeline;
       VulkanBuffer<SSBO_ModelObject> objects_modelPipeline;
+      BufferSet uniformBuffers_modelPipeline;
 
       BufferSet storageBuffers_shipPipeline;
       VulkanBuffer<SSBO_ModelObject> objects_shipPipeline;
+      BufferSet uniformBuffers_shipPipeline;
 
       BufferSet storageBuffers_asteroidPipeline;
       VulkanBuffer<SSBO_Asteroid> objects_asteroidPipeline;
+      BufferSet uniformBuffers_asteroidPipeline;
 
       BufferSet storageBuffers_laserPipeline;
       VulkanBuffer<SSBO_Laser> objects_laserPipeline;
+      BufferSet uniformBuffers_laserPipeline;
 
       BufferSet storageBuffers_explosionPipeline;
       VulkanBuffer<SSBO_Explosion> objects_explosionPipeline;
+      BufferSet uniformBuffers_explosionPipeline;
 
       // TODO: Maybe make the ubo objects part of the pipeline class since there's only one ubo
@@ -342 +347 @@
       vector<SceneObject<ModelVertex, SSBO_ModelObject>> modelObjects;
 
-      vector<VkBuffer> uniformBuffers_modelPipeline;
-      vector<VkDeviceMemory> uniformBuffersMemory_modelPipeline;
-      vector<VkDescriptorBufferInfo> uniformBufferInfoList_modelPipeline;
-
       UBO_VP_mats object_VP_mats;
 
       vector<SceneObject<ModelVertex, SSBO_ModelObject>> shipObjects;
 
-      vector<VkBuffer> uniformBuffers_shipPipeline;
-      vector<VkDeviceMemory> uniformBuffersMemory_shipPipeline;
-      vector<VkDescriptorBufferInfo> uniformBufferInfoList_shipPipeline;
-
       UBO_VP_mats ship_VP_mats;
 
       vector<SceneObject<ModelVertex, SSBO_Asteroid>> asteroidObjects;
 
-      vector<VkBuffer> uniformBuffers_asteroidPipeline;
-      vector<VkDeviceMemory> uniformBuffersMemory_asteroidPipeline;
-      vector<VkDescriptorBufferInfo> uniformBufferInfoList_asteroidPipeline;
-
       UBO_VP_mats asteroid_VP_mats;
 
       vector<SceneObject<LaserVertex, SSBO_Laser>> laserObjects;
 
-      vector<VkBuffer> uniformBuffers_laserPipeline;
-      vector<VkDeviceMemory> uniformBuffersMemory_laserPipeline;
-      vector<VkDescriptorBufferInfo> uniformBufferInfoList_laserPipeline;
-
       UBO_VP_mats laser_VP_mats;
 
       vector<SceneObject<ExplosionVertex, SSBO_Explosion>> explosionObjects;
-
-      vector<VkBuffer> uniformBuffers_explosionPipeline;
-      vector<VkDeviceMemory> uniformBuffersMemory_explosionPipeline;
-      vector<VkDescriptorBufferInfo> uniformBufferInfoList_explosionPipeline;
 
       UBO_Explosion explosion_UBO;
@@ -448 +433 @@
 
       void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
-                           vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
-                           vector<VkDescriptorBufferInfo>& bufferInfoList);
+                           BufferSet& set);
 
       // TODO: See if it makes sense to rename this to resizeBufferSet() and use it to resize other types of buffers as well