Changeset 567fa88 in opengl-game

Timestamp:

Jun 7, 2021, 11:59:27 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

c074f81

Parents:

58453c3

Message:

Change createRenderCommands() to support dynamic offsets

Files:

• graphics-pipeline_vulkan.hpp (modified) (2 diffs)
• sdl-game.cpp (modified) (1 diff)
• vulkan-game.cpp (modified) (1 diff)

graphics-pipeline_vulkan.hpp

@@ -63 +63 @@
       void createDescriptorSets(uint32_t size);
 
-      void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage);
+      void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage,
+                                const vector<uint32_t>& dynamicOffsets);
 
       void addObject(const vector<VertexType>& vertices, vector<uint16_t> indices, VkCommandPool commandPool,
@@ -473 +474 @@
 
 template<class VertexType>
-void GraphicsPipeline_Vulkan<VertexType>::createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage) {
+void GraphicsPipeline_Vulkan<VertexType>::createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage,
+                                                               const vector<uint32_t>& dynamicOffsets) {
    vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
 
+   // If more dynamic UBOs are added, this needs to become an array of offsets
    vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1,
-      &descriptorSets[currentImage], 0, nullptr);
+      &descriptorSets[currentImage], dynamicOffsets.size(), dynamicOffsets.data());
 
    VkBuffer vertexBuffers[] = { vertexBuffer };

sdl-game.cpp

@@ -1177 +1177 @@
    // TODO: Find a more elegant, per-screen solution for this
    if (currentRenderScreenFn == &VulkanGame::renderGameScreen) {
-      modelPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex);
+      modelPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex, {});
 
 

vulkan-game.cpp

@@ -1790 +1790 @@
    // TODO: Find a more elegant, per-screen solution for this
    if (currentRenderScreenFn == &VulkanGame::renderGameScreen) {
-      modelPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex);
-      shipPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex);
-      asteroidPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex);
-      laserPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex);
-      explosionPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex);
+      modelPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex, {});
+      shipPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex, {});
+      asteroidPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex, {});
+      laserPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex, {});
+      explosionPipeline.createRenderCommands(commandBuffers[imageIndex], imageIndex, {});
    }