Changeset 90880fb in opengl-game for sdl-game.cpp

Timestamp:

Jun 17, 2021, 11:59:14 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

2f4ff8c

Parents:

5ea0a37

git-author:

Dmitry Portnoy <dportnoy@…> (06/13/21 23:57:17)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/17/21 23:59:14)

Message:

Start using the VulkanBuffer class for the non-per-object uniforms (this means the view and projection matrices for all pipelines, as well as the current time for the explosion pipeline)

File:

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

sdl-game.cpp

@@ -70 +70 @@
                      , gui(nullptr)
                      , window(nullptr)
+                     , vp_mats_modelPipeline()
                      , objects_modelPipeline()
                      , score(0)
@@ -91 +92 @@
    VkPhysicalDeviceProperties deviceProperties;
    vkGetPhysicalDeviceProperties(physicalDevice, &deviceProperties);
+
+   vp_mats_modelPipeline = VulkanBuffer<UBO_VP_mats>(1, deviceProperties.limits.maxUniformBufferRange,
+                                                     deviceProperties.limits.minUniformBufferOffsetAlignment);
 
    objects_modelPipeline = VulkanBuffer<SSBO_ModelObject>(10, deviceProperties.limits.maxStorageBufferRange,
@@ -110 +114 @@
    modelPipeline.addAttribute(VK_FORMAT_R32_UINT, offset_of(&ModelVertex::objIndex));
 
-   createBufferSet(sizeof(UBO_VP_mats),
+   createBufferSet(vp_mats_modelPipeline.memorySize(),
                    VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
                    VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
                    uniformBuffers_modelPipeline);
 
-   createBufferSet(objects_modelPipeline.capacity * sizeof(SSBO_ModelObject),
+   createBufferSet(objects_modelPipeline.memorySize(),
                    VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT
                    | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
@@ -289 +293 @@
    projMat = perspective(radians(FOV_ANGLE), (float)swapChainExtent.width / (float)swapChainExtent.height, NEAR_CLIP, FAR_CLIP);
    projMat[1][1] *= -1; // flip the y-axis so that +y is up
-
-   object_VP_mats.view = viewMat;
-   object_VP_mats.proj = projMat;
 }
 
@@ -444 +445 @@
 
 void VulkanGame::updateScene() {
-   // TODO: Probably move the resizing to the VulkanBuffer class
+   vp_mats_modelPipeline.data()->view = viewMat;
+   vp_mats_modelPipeline.data()->proj = projMat;
+
+   // TODO: Probably move the resizing to the VulkanBuffer class's add() method
+   // Remember that we want to avoid resizing the actuall ssbo or ubo more than once per frame
+   // TODO: Figure out a way to make updateDescriptorInfo easier to use, maybe store the binding index in the buffer set
+
    if (objects_modelPipeline.resized) {
       resizeBufferSet(storageBuffers_modelPipeline, objects_modelPipeline.memorySize(), resourceCommandPool,
@@ -467 +474 @@
    }
 
+   VulkanUtils::copyDataToMemory(device, vp_mats_modelPipeline.data(), uniformBuffers_modelPipeline.memory[imageIndex],
+                                 0, vp_mats_modelPipeline.memorySize(), false);
+
    VulkanUtils::copyDataToMemory(device, objects_modelPipeline.data(), storageBuffers_modelPipeline.memory[imageIndex],
                                  0, objects_modelPipeline.memorySize(), false);
-
-   VulkanUtils::copyDataToMemory(device, &object_VP_mats, uniformBuffers_modelPipeline.memory[imageIndex], 0,
-                                 sizeof(object_VP_mats), false);
 }
 
@@ -1275 +1282 @@
    createSyncObjects();
 
-   createBufferSet(sizeof(UBO_VP_mats),
+   createBufferSet(vp_mats_modelPipeline.memorySize(),
                    VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
                    VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,