Changeset 9d21aac in opengl-game for sdl-game.cpp

Timestamp:

May 6, 2021, 3:24:42 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

996dd3e

Parents:

756162f

Message:

Remove the SSBOType template parameter from GraphicsPipeline_Vulkan

File:

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

sdl-game.cpp

@@ -103 +103 @@
    modelPipeline.addAttribute(VK_FORMAT_R32_UINT, offset_of(&ModelVertex::objIndex));
 
-   createBufferSet(uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, sizeof(UBO_VP_mats),
+   createBufferSet(sizeof(UBO_VP_mats),
       VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-      uniformBufferInfoList_modelPipeline);
+      uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, uniformBufferInfoList_modelPipeline);
 
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
       VK_SHADER_STAGE_VERTEX_BIT, &uniformBufferInfoList_modelPipeline);
-   modelPipeline.addStorageDescriptor(VK_SHADER_STAGE_VERTEX_BIT);
+   modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+      VK_SHADER_STAGE_VERTEX_BIT, &modelPipeline.storageBufferSet.infoSet);
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
       VK_SHADER_STAGE_FRAGMENT_BIT, &floorTextureImageDescriptor);
@@ -256 +257 @@
 
 void VulkanGame::initGraphicsPipelines() {
-   modelPipeline = GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject>(
+   modelPipeline = GraphicsPipeline_Vulkan<ModelVertex>(
       VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, physicalDevice, device, renderPass,
       { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 16, 24, 10);
+
+   createBufferSet(modelPipeline.objectCapacity * sizeof(SSBO_ModelObject),
+      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);
 }
 
@@ -468 +475 @@
    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);
+   }
+
    // END UNREVIEWED SECTION
 
@@ -1083 +1095 @@
 }
 
-void VulkanGame::createBufferSet(vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
-                                 VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+                                 vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
                                  vector<VkDescriptorBufferInfo>& bufferInfoList) {
    buffers.resize(swapChainImageCount);
@@ -1230 +1242 @@
    // instead of recreated every time
 
-   createBufferSet(uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, sizeof(UBO_VP_mats),
+   createBufferSet(sizeof(UBO_VP_mats),
       VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-      uniformBufferInfoList_modelPipeline);
+      uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, uniformBufferInfoList_modelPipeline);
 
    modelPipeline.updateRenderPass(renderPass);