Changeset bb76950 in opengl-game for vulkan-game.hpp

Timestamp:

Jun 9, 2021, 6:41:48 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

b7fc3c2

Parents:

6bac215

git-author:

Dmitry Portnoy <dportnoy@…> (06/09/21 18:41:20)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/09/21 18:41:48)

Message:

Change VulkanGame::resizeBufferSet() to take a buffer size instead of an entire
VulkanBuffer object, and to not update descriptor sets, which obviates the need
to pass in a GraphicsPipeline_Vulkan object. Descriptor set updates must
now be handled separetly.

File:

• vulkan-game.hpp (modified) (3 diffs)

vulkan-game.hpp

@@ -124 +124 @@
    vec3 center; // currently only matters for asteroids
    float radius; // currently only matters for asteroids
+
+   // Move the targetAsteroid stuff out of this class since it is very specific to lasers
+   // and makes moving SceneObject into its own header file more problematic
    SceneObject<ModelVertex, SSBO_Asteroid>* targetAsteroid; // currently only used for lasers
 };
@@ -432 +435 @@
                            BufferSet& set);
 
-      template<class VertexType, class SSBOType>
-      void resizeBufferSet(BufferSet& set, VulkanBuffer<SSBOType>& buffer,
-                           GraphicsPipeline_Vulkan<VertexType>& pipeline, VkCommandPool commandPool,
-                           VkQueue graphicsQueue);
+      void resizeBufferSet(BufferSet& set, VkDeviceSize newSize, VkCommandPool commandPool, VkQueue graphicsQueue,
+                           bool copyData);
 
       template<class SSBOType>
@@ -498 +499 @@
 
 // End of specialized no-op functions
-
-template<class VertexType, class SSBOType>
-void VulkanGame::resizeBufferSet(BufferSet& set, VulkanBuffer<SSBOType>& buffer,
-                                 GraphicsPipeline_Vulkan<VertexType>& pipeline, VkCommandPool commandPool,
-                                 VkQueue graphicsQueue) {
-   VkDeviceSize newSize = buffer.capacity * sizeof(SSBOType);
-
-   for (size_t i = 0; i < set.buffers.size(); i++) {
-      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] = 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 = newSize; // Size of the update starting from offset, or VK_WHOLE_SIZE
-   }
-
-   // Assume the SSBO is always the 2nd binding
-   // TODO: Figure out a way to make this more flexible
-   pipeline.updateDescriptorInfo(1, &set.infoSet, swapChainImages.size());
-}
 
 // TODO: See if it makes sense to pass in the current swapchain index instead of updating all of them