Changeset 6bac215 in opengl-game for vulkan-game.cpp

Timestamp:

Jun 9, 2021, 12:38:14 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

bb76950

Parents:

8dcbf62

git-author:

Dmitry Portnoy <dportnoy@…> (06/09/21 00:38:09)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/09/21 00:38:14)

Message:

Rewrite a large portion of the VulkanBuffer class, start using it more
to resize buffers, and simplify resizeBufferSet() since the additions to
VulkanBuffer can now do some of what that function used to do

File:

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

vulkan-game.cpp

@@ -616 +616 @@
 
    createBufferSet(objects_modelPipeline.capacity * sizeof(SSBO_ModelObject),
-      VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
-      VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-      storageBuffers_modelPipeline);
+                   VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT
+                   | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
+                   VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+                   storageBuffers_modelPipeline);
 
    shipPipeline = GraphicsPipeline_Vulkan<ModelVertex>(
@@ -625 +626 @@
 
    createBufferSet(objects_shipPipeline.capacity * sizeof(SSBO_ModelObject),
-      VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
-      VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-      storageBuffers_shipPipeline);
+                   VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT
+                   | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
+                   VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+                   storageBuffers_shipPipeline);
 
    asteroidPipeline = GraphicsPipeline_Vulkan<ModelVertex>(
@@ -634 +636 @@
 
    createBufferSet(objects_asteroidPipeline.capacity * sizeof(SSBO_Asteroid),
-      VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
-      VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-      storageBuffers_asteroidPipeline);
+                   VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT
+                   | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
+                   VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+                   storageBuffers_asteroidPipeline);
 
    laserPipeline = GraphicsPipeline_Vulkan<LaserVertex>(
@@ -643 +646 @@
 
    createBufferSet(objects_laserPipeline.capacity * sizeof(SSBO_Laser),
-      VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
-      VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-      storageBuffers_laserPipeline);
+                   VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT
+                   | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
+                   VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+                   storageBuffers_laserPipeline);
 
    explosionPipeline = GraphicsPipeline_Vulkan<ExplosionVertex>(
@@ -653 +657 @@
 
    createBufferSet(objects_explosionPipeline.capacity * sizeof(SSBO_Explosion),
-      VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
-      VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-      storageBuffers_explosionPipeline);
+                   VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT
+                   | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
+                   VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+                   storageBuffers_explosionPipeline);
 }
 
@@ -1085 +1090 @@
 
    // TODO: Probably move the resizing to the VulkanBuffer class
-   if (objects_modelPipeline.numObjects > objects_modelPipeline.capacity) {
+   if (objects_modelPipeline.resized) {
       resizeBufferSet(storageBuffers_modelPipeline, objects_modelPipeline, modelPipeline, resourceCommandPool,
                       graphicsQueue);
+
+      objects_modelPipeline.resize();
    }
 
@@ -1098 +1105 @@
 
    // TODO: Probably move the resizing to the VulkanBuffer class
-   if (objects_shipPipeline.numObjects > objects_shipPipeline.capacity) {
+   if (objects_shipPipeline.resized) {
       resizeBufferSet(storageBuffers_shipPipeline, objects_shipPipeline, shipPipeline, resourceCommandPool,
                       graphicsQueue);
+
+      objects_shipPipeline.resize();
    }
 
@@ -1111 +1120 @@
 
    // TODO: Probably move the resizing to the VulkanBuffer class
-   if (objects_asteroidPipeline.numObjects > objects_asteroidPipeline.capacity) {
+   if (objects_asteroidPipeline.resized) {
       resizeBufferSet(storageBuffers_asteroidPipeline, objects_asteroidPipeline, asteroidPipeline,
                       resourceCommandPool, graphicsQueue);
+
+      objects_asteroidPipeline.resize();
    }
 
@@ -1124 +1135 @@
 
    // TODO: Probably move the resizing to the VulkanBuffer class
-   if (objects_laserPipeline.numObjects > objects_laserPipeline.capacity) {
+   if (objects_laserPipeline.resized) {
       resizeBufferSet(storageBuffers_laserPipeline, objects_laserPipeline, laserPipeline, resourceCommandPool,
                       graphicsQueue);
+
+      objects_laserPipeline.resize();
    }
 
@@ -1137 +1150 @@
 
    // TODO: Probably move the resizing to the VulkanBuffer class
-   if (objects_explosionPipeline.numObjects > objects_explosionPipeline.capacity) {
+   if (objects_explosionPipeline.resized) {
       resizeBufferSet(storageBuffers_explosionPipeline, objects_explosionPipeline, explosionPipeline,
                      resourceCommandPool, graphicsQueue);
+
+      objects_explosionPipeline.resize();
    }