Changeset 67527a5 in opengl-game for sdl-game.cpp

Timestamp:

Jun 21, 2021, 4:12:08 PM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

27e580e

Parents:

b01b50c

git-author:

Dmitry Portnoy <dportnoy@…> (06/21/21 15:13:03)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/21/21 16:12:08)

Message:

Switch all per-object buffers to be dynamic uniform buffers instead of shader storage buffers

File:

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

sdl-game.cpp

@@ -96 +96 @@
                                                       deviceProperties.limits.minUniformBufferOffsetAlignment);
 
-   objects_modelPipeline = VulkanBuffer<SSBO_ModelObject>(10, deviceProperties.limits.maxStorageBufferRange,
-                                                          deviceProperties.limits.minStorageBufferOffsetAlignment);
+   objects_modelPipeline = VulkanBuffer<SSBO_ModelObject>(10, deviceProperties.limits.maxUniformBufferRange,
+                                                          deviceProperties.limits.minUniformBufferOffsetAlignment);
 
    initImGuiOverlay();
@@ -123 +123 @@
    createBufferSet(objects_modelPipeline.memorySize(),
                    VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT
-                   | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
+                   | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
                    VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
                    objectBuffers_modelPipeline);
@@ -131 +131 @@
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
       VK_SHADER_STAGE_VERTEX_BIT, &uniformBuffers_modelPipeline.infoSet);
-   modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+   modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC,
       VK_SHADER_STAGE_VERTEX_BIT, &objectBuffers_modelPipeline.infoSet);
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
@@ -482 +482 @@
    }
 
-   VulkanUtils::copyDataToMappedMemory(device, uniforms_modelPipeline.data(), uniforms_modelPipeline.mapped(imageIndex),
+   VulkanUtils::copyDataToMappedMemory(device, uniforms_modelPipeline.data(),
+                                       uniforms_modelPipeline.mapped(imageIndex),
                                        uniformBuffers_modelPipeline.memory[imageIndex],
                                        uniforms_modelPipeline.memorySize(), true);
 
-   VulkanUtils::copyDataToMappedMemory(device, objects_modelPipeline.data(), objects_modelPipeline.mapped(imageIndex),
+   VulkanUtils::copyDataToMappedMemory(device, objects_modelPipeline.data(),
+                                       objects_modelPipeline.mapped(imageIndex),
                                        objectBuffers_modelPipeline.memory[imageIndex],
                                        objects_modelPipeline.memorySize(), true);
@@ -1213 +1215 @@
    // TODO: Find a more elegant, per-screen solution for this
    if (currentRenderScreenFn == &VulkanGame::renderGameScreen) {
-      modelPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex, {});
+      modelPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex, { 0 });
 
 
@@ -1301 +1303 @@
    createBufferSet(objects_modelPipeline.memorySize(),
                    VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT
-                   | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
+                   | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
                    VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
                    objectBuffers_modelPipeline);