Changeset 996dd3e in opengl-game for sdl-game.cpp

Timestamp:

May 14, 2021, 1:09:34 AM (4 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:

• sdl-game.cpp (modified) (8 diffs)

sdl-game.cpp

@@ -110 +110 @@
       VK_SHADER_STAGE_VERTEX_BIT, &uniformBufferInfoList_modelPipeline);
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-      VK_SHADER_STAGE_VERTEX_BIT, &modelPipeline.storageBufferSet.infoSet);
+      VK_SHADER_STAGE_VERTEX_BIT, &storageBuffers_modelPipeline.infoSet);
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
       VK_SHADER_STAGE_FRAGMENT_BIT, &floorTextureImageDescriptor);
@@ -131 +131 @@
       }, {
          mat4(1.0f)
-      }, false);
+      }, storageBuffers_modelPipeline, false);
+
+   updateStorageBuffer(storageBuffers_modelPipeline, modelPipeline.numObjects - 1, texturedSquare->ssbo);
 
    texturedSquare->model_base =
@@ -150 +152 @@
       }, {
          mat4(1.0f)
-      }, false);
+      }, storageBuffers_modelPipeline, false);
+
+   updateStorageBuffer(storageBuffers_modelPipeline, modelPipeline.numObjects - 1, texturedSquare->ssbo);
 
    texturedSquare->model_base =
@@ -264 +268 @@
       VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
       VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-      modelPipeline.storageBufferSet.buffers, modelPipeline.storageBufferSet.memory,
-      modelPipeline.storageBufferSet.infoSet);
+      storageBuffers_modelPipeline.buffers, storageBuffers_modelPipeline.memory,
+      storageBuffers_modelPipeline.infoSet);
 }
 
@@ -372 +376 @@
                         }, {
                            mat4(1.0f)
-                        }, true);
+                        }, storageBuffers_modelPipeline, true);
+
+                  updateStorageBuffer(storageBuffers_modelPipeline, modelPipeline.numObjects - 1, texturedSquare.ssbo);
 
                   texturedSquare.model_base =
@@ -439 +445 @@
 }
 
-// TODO: The only updates that need to happen once per Vulkan image are the SSBO ones,
-// which are already handled by updateObject(). Move this code to a different place,
-// where it will run just once per frame
 void VulkanGame::updateScene() {
+   // TODO: These two for loops could probably be combined into one
+
    for (SceneObject<ModelVertex, SSBO_ModelObject>& model : this->modelObjects) {
       model.model_transform =
@@ -450 +455 @@
    }
 
+   // TODO: Instead, update entire sections (up to 64k) of the dynamic ubo if some objects there have changed
+   // Also, update the objects modelMat and center in the loop above instead of here
    for (size_t i = 0; i < modelObjects.size(); i++) {
       if (modelObjects[i].modified) {
+         // TODO: Think about changing the SSBO-related code to also use a contiguous array
+         // to store the data on the cpu side instead of storing it per-object
+         // Then, I could also copy it to the GPU in one go
+         // Also, double-check if the alignment restrictions also hold for SSBOs
+
          updateObject(modelObjects, modelPipeline, i);
+         updateStorageBuffer(storageBuffers_modelPipeline, i, modelObjects[i].ssbo);
       }
    }
@@ -475 +488 @@
    modelPipeline.cleanupBuffers();
 
-   for (size_t i = 0; i < modelPipeline.storageBufferSet.buffers.size(); i++) {
-      vkDestroyBuffer(device, modelPipeline.storageBufferSet.buffers[i], nullptr);
-      vkFreeMemory(device, modelPipeline.storageBufferSet.memory[i], nullptr);
+   for (size_t i = 0; i < storageBuffers_modelPipeline.buffers.size(); i++) {
+      vkDestroyBuffer(device, storageBuffers_modelPipeline.buffers[i], nullptr);
+      vkFreeMemory(device, storageBuffers_modelPipeline.memory[i], nullptr);
    }