Changeset e8445f0 in opengl-game for graphics-pipeline_vulkan.hpp

Timestamp:

Apr 22, 2021, 1:54:17 AM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

b8072d3

Parents:

4a777d2

git-author:

Dmitry Portnoy <dportnoy@…> (04/22/21 01:54:07)

git-committer:

Dmitry Portnoy <dportnoy@…> (04/22/21 01:54:17)

Message:

Modify the parameter order of VulkanUtils::copyDataToMemory and add an overload
that takes the data size as a parameter instead of getting it from the template type

File:

• graphics-pipeline_vulkan.hpp (modified) (6 diffs)

graphics-pipeline_vulkan.hpp

@@ -32 +32 @@
 };
 
-// TODO: Use this struct for uniform buffers as well (maybe move it to VulkanUtils)
+// TODO: Use this struct for uniform buffers as well and rename it to VulkanBuffer (maybe move it to VulkanUtils)
+// Also, probably better to make this a vector of structs where each struct
+// has a VkBuffer, VkDeviceMemory, and VkDescriptorBufferInfo
 struct StorageBufferSet {
    vector<VkBuffer> buffers;
@@ -64 +66 @@
       void addStorageDescriptor(VkShaderStageFlags stageFlags);
 
-      void addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, vector<VkDescriptorBufferInfo>* bufferData);
+      // TODO: I might be able to use a single VkDescriptorBufferInfo here and reuse it when creating the descriptor sets
+      void addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags,
+                             vector<VkDescriptorBufferInfo>* bufferData);
       void addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, VkDescriptorImageInfo* imageData);
 
@@ -75 +79 @@
 
       bool addObject(const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType& ssbo,
-         VkCommandPool commandPool, VkQueue graphicsQueue);
+                     VkCommandPool commandPool, VkQueue graphicsQueue);
 
       void updateObject(size_t objIndex, SSBOType& ssbo);
 
       void updateObjectVertices(size_t objIndex, const vector<VertexType>& vertices, VkCommandPool commandPool,
-         VkQueue graphicsQueue);
+                                VkQueue graphicsQueue);
 
       void cleanup();
@@ -456 +460 @@
          switch (descriptorWrites[j].descriptorType) {
             case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
+            case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
             case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
                descriptorWrites[j].pBufferInfo = &(*this->descriptorInfoList[j].bufferDataList)[i];
@@ -474 +479 @@
 void GraphicsPipeline_Vulkan<VertexType, SSBOType>::createRenderCommands(VkCommandBuffer& commandBuffer,
       uint32_t currentImage) {
+
    vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
+
    vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1,
       &descriptorSets[currentImage], 0, nullptr);
@@ -543 +550 @@
 }
 
+// TODO: Allow a swapchain index to be passed in instead of updating all of them
+// Actually, since I'm in the process of replacing SSBOs with dynamic UBOs, I can ignore that for this function
 template<class VertexType, class SSBOType>
 void GraphicsPipeline_Vulkan<VertexType, SSBOType>::updateObject(size_t objIndex, SSBOType& ssbo) {
    if (!is_same_v<SSBOType, void*>) {
       for (size_t i = 0; i < storageBufferSet.memory.size(); i++) {
-         VulkanUtils::copyDataToMemory(this->device, storageBufferSet.memory[i], objIndex * sizeof(SSBOType), ssbo);
+         VulkanUtils::copyDataToMemory(this->device, ssbo, storageBufferSet.memory[i], objIndex * sizeof(SSBOType));
       }
    }