Changeset 6bac215 in opengl-game for sdl-game.hpp

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:

• sdl-game.hpp (modified) (1 diff)

sdl-game.hpp

@@ -348 +348 @@
                                  GraphicsPipeline_Vulkan<VertexType>& pipeline, VkCommandPool commandPool,
                                  VkQueue graphicsQueue) {
-   size_t numObjects = buffer.numObjects < buffer.capacity ? buffer.numObjects : buffer.capacity;
-
-   do {
-      buffer.capacity *= 2;
-   } while (buffer.capacity < buffer.numObjects);
-
-   VkDeviceSize bufferSize = buffer.capacity * sizeof(SSBOType);
+   VkDeviceSize newSize = buffer.capacity * sizeof(SSBOType);
 
    for (size_t i = 0; i < set.buffers.size(); i++) {
-      VkBuffer newStorageBuffer;
-      VkDeviceMemory newStorageBufferMemory;
-
-      VulkanUtils::createBuffer(device, physicalDevice, bufferSize,
-         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,
-         newStorageBuffer, newStorageBufferMemory);
-
-      VulkanUtils::copyBuffer(device, commandPool, set.buffers[i], newStorageBuffer,
-         0, 0, numObjects * sizeof(SSBOType), graphicsQueue);
+      VkBuffer newBuffer;
+      VkDeviceMemory newMemory;
+
+      VulkanUtils::createBuffer(device, physicalDevice, newSize, set.usages, set.properties, newBuffer, newMemory);
+
+      VulkanUtils::copyBuffer(device, commandPool, set.buffers[i], newBuffer, 0, 0, set.infoSet[i].range,
+                              graphicsQueue);
 
       vkDestroyBuffer(device, set.buffers[i], nullptr);
       vkFreeMemory(device, set.memory[i], nullptr);
 
-      set.buffers[i] = newStorageBuffer;
-      set.memory[i] = newStorageBufferMemory;
+      set.buffers[i] = newBuffer;
+      set.memory[i] = newMemory;
 
       set.infoSet[i].buffer = set.buffers[i];
       set.infoSet[i].offset = 0; // This is the offset from the start of the buffer, so always 0 for now
-      set.infoSet[i].range = bufferSize; // Size of the update starting from offset, or VK_WHOLE_SIZE
+      set.infoSet[i].range = newSize; // Size of the update starting from offset, or VK_WHOLE_SIZE
    }