Changes in / [28c13da:58b95b3] in opengl-game

File:

• vulkan-game.cpp (modified) (20 diffs)

vulkan-game.cpp

@@ -112 +112 @@
 
 struct GraphicsPipelineInfo {
-   VkPipelineLayout pipelineLayout;
    VkPipeline pipeline;
-
-   VkDescriptorPool descriptorPool;
-   VkDescriptorSetLayout descriptorSetLayout;
-   vector<VkDescriptorSet> descriptorSets;
 
    VkBuffer vertexBuffer;
@@ -192 +187 @@
 
       VkRenderPass renderPass;
+      VkDescriptorSetLayout descriptorSetLayout;
+      VkPipelineLayout pipelineLayout;
+      VkDescriptorPool descriptorPool;
+      vector<VkDescriptorSet> descriptorSets;
+
       VkCommandPool commandPool;
 
@@ -313 +313 @@
          createImageViews();
          createRenderPass();
-
-         createDescriptorSetLayout(scenePipeline);
-         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", scenePipeline);
-
-         createDescriptorSetLayout(overlayPipeline);
-         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", overlayPipeline);
-
+         createDescriptorSetLayout();
+         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", &scenePipeline.pipeline);
+         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", &overlayPipeline.pipeline);
          createCommandPool();
          createDepthResources();
@@ -362 +358 @@
 
          createUniformBuffers();
-
-         createDescriptorPool(scenePipeline);
-         createDescriptorSets(scenePipeline);
-
-         createDescriptorPool(overlayPipeline);
-         createDescriptorSets(overlayPipeline);
-
+         createDescriptorPool();
+         createDescriptorSets();
          createCommandBuffers();
          createSyncObjects();
@@ -775 +766 @@
       }
 
-      void createDescriptorSetLayout(GraphicsPipelineInfo& info) {
+      void createDescriptorSetLayout() {
          VkDescriptorSetLayoutBinding uboLayoutBinding = {};
          uboLayoutBinding.binding = 0;
@@ -803 +794 @@
          layoutInfo.pBindings = bindings.data();
 
-         if (vkCreateDescriptorSetLayout(device, &layoutInfo, nullptr, &info.descriptorSetLayout) != VK_SUCCESS) {
+         if (vkCreateDescriptorSetLayout(device, &layoutInfo, nullptr, &descriptorSetLayout) != VK_SUCCESS) {
             throw runtime_error("failed to create descriptor set layout!");
          }
       }
 
-      void createGraphicsPipeline(string vertShaderFile, string fragShaderFile, GraphicsPipelineInfo& info) {
+      void createGraphicsPipeline(string vertShaderFile, string fragShaderFile, VkPipeline* pipeline) {
          auto vertShaderCode = readFile(vertShaderFile);
          auto fragShaderCode = readFile(fragShaderFile);
@@ -915 +906 @@
          pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
          pipelineLayoutInfo.setLayoutCount = 1;
-         pipelineLayoutInfo.pSetLayouts = &info.descriptorSetLayout;
+         pipelineLayoutInfo.pSetLayouts = &descriptorSetLayout;
          pipelineLayoutInfo.pushConstantRangeCount = 0;
 
-         if (vkCreatePipelineLayout(device, &pipelineLayoutInfo, nullptr, &info.pipelineLayout) != VK_SUCCESS) {
+         if (vkCreatePipelineLayout(device, &pipelineLayoutInfo, nullptr, &pipelineLayout) != VK_SUCCESS) {
             throw runtime_error("failed to create pipeline layout!");
          }
@@ -934 +925 @@
          pipelineInfo.pColorBlendState = &colorBlending;
          pipelineInfo.pDynamicState = nullptr;
-         pipelineInfo.layout = info.pipelineLayout;
+         pipelineInfo.layout = pipelineLayout;
          pipelineInfo.renderPass = renderPass;
          pipelineInfo.subpass = 0;
@@ -940 +931 @@
          pipelineInfo.basePipelineIndex = -1;
 
-         if (vkCreateGraphicsPipelines(device, VK_NULL_HANDLE, 1, &pipelineInfo, nullptr, &info.pipeline) != VK_SUCCESS) {
+         if (vkCreateGraphicsPipelines(device, VK_NULL_HANDLE, 1, &pipelineInfo, nullptr, pipeline) != VK_SUCCESS) {
             throw runtime_error("failed to create graphics pipeline!");
          }
@@ -1496 +1487 @@
       }
 
-      void createDescriptorPool(GraphicsPipelineInfo& info) {
+      void createDescriptorPool() {
          array<VkDescriptorPoolSize, 3> poolSizes = {};
          poolSizes[0].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
@@ -1511 +1502 @@
          poolInfo.maxSets = static_cast<uint32_t>(swapChainImages.size());
 
-         if (vkCreateDescriptorPool(device, &poolInfo, nullptr, &info.descriptorPool) != VK_SUCCESS) {
+         if (vkCreateDescriptorPool(device, &poolInfo, nullptr, &descriptorPool) != VK_SUCCESS) {
             throw runtime_error("failed to create descriptor pool!");
          }
       }
 
-      void createDescriptorSets(GraphicsPipelineInfo& info) {
-         vector<VkDescriptorSetLayout> layouts(swapChainImages.size(), info.descriptorSetLayout);
+      void createDescriptorSets() {
+         vector<VkDescriptorSetLayout> layouts(swapChainImages.size(), descriptorSetLayout);
 
          VkDescriptorSetAllocateInfo allocInfo = {};
          allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
-         allocInfo.descriptorPool = info.descriptorPool;
+         allocInfo.descriptorPool = descriptorPool;
          allocInfo.descriptorSetCount = static_cast<uint32_t>(swapChainImages.size());
          allocInfo.pSetLayouts = layouts.data();
 
-         info.descriptorSets.resize(swapChainImages.size());
-         if (vkAllocateDescriptorSets(device, &allocInfo, info.descriptorSets.data()) != VK_SUCCESS) {
+         descriptorSets.resize(swapChainImages.size());
+         if (vkAllocateDescriptorSets(device, &allocInfo, descriptorSets.data()) != VK_SUCCESS) {
             throw runtime_error("failed to allocate descriptor sets!");
          }
@@ -1549 +1540 @@
 
             descriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-            descriptorWrites[0].dstSet = info.descriptorSets[i];
+            descriptorWrites[0].dstSet = descriptorSets[i];
             descriptorWrites[0].dstBinding = 0;
             descriptorWrites[0].dstArrayElement = 0;
@@ -1559 +1550 @@
 
             descriptorWrites[1].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-            descriptorWrites[1].dstSet = info.descriptorSets[i];
+            descriptorWrites[1].dstSet = descriptorSets[i];
             descriptorWrites[1].dstBinding = 1;
             descriptorWrites[1].dstArrayElement = 0;
@@ -1569 +1560 @@
 
             descriptorWrites[2].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-            descriptorWrites[2].dstSet = info.descriptorSets[i];
+            descriptorWrites[2].dstSet = descriptorSets[i];
             descriptorWrites[2].dstBinding = 2;
             descriptorWrites[2].dstArrayElement = 0;
@@ -1621 +1612 @@
             vkCmdBeginRenderPass(commandBuffers[i], &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 
-            createGraphicsPipelineCommands(scenePipeline, i);
-            createGraphicsPipelineCommands(overlayPipeline, i);
+            vkCmdBindPipeline(commandBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, scenePipeline.pipeline);
+
+            vkCmdBindDescriptorSets(commandBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSets[i], 0, nullptr);
+
+            VkDeviceSize offsets[] = { 0 };
+
+            VkBuffer vertexBuffers[] = { scenePipeline.vertexBuffer };
+            vkCmdBindVertexBuffers(commandBuffers[i], 0, 1, vertexBuffers, offsets);
+
+            vkCmdBindIndexBuffer(commandBuffers[i], scenePipeline.indexBuffer, 0, VK_INDEX_TYPE_UINT16);
+
+            vkCmdDrawIndexed(commandBuffers[i], static_cast<uint32_t>(scenePipeline.numIndices), 1, 0, 0, 0);
+
+            vkCmdBindPipeline(commandBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, overlayPipeline.pipeline);
+
+            VkBuffer vertexBuffersOverlay[] = { overlayPipeline.vertexBuffer };
+            vkCmdBindVertexBuffers(commandBuffers[i], 0, 1, vertexBuffersOverlay, offsets);
+
+            vkCmdBindIndexBuffer(commandBuffers[i], overlayPipeline.indexBuffer, 0, VK_INDEX_TYPE_UINT16);
+
+            vkCmdDrawIndexed(commandBuffers[i], static_cast<uint32_t>(overlayPipeline.numIndices), 1, 0, 0, 0);
 
             vkCmdEndRenderPass(commandBuffers[i]);
@@ -1630 +1640 @@
             }
          }
-      }
-
-      void createGraphicsPipelineCommands(GraphicsPipelineInfo& info, size_t imageIdx) {
-         vkCmdBindPipeline(commandBuffers[imageIdx], VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipeline);
-         vkCmdBindDescriptorSets(commandBuffers[imageIdx], VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipelineLayout, 0, 1,
-            &info.descriptorSets[imageIdx], 0, nullptr);
-
-         VkBuffer vertexBuffers[] = { info.vertexBuffer };
-         VkDeviceSize offsets[] = { 0 };
-         vkCmdBindVertexBuffers(commandBuffers[imageIdx], 0, 1, vertexBuffers, offsets);
-
-         vkCmdBindIndexBuffer(commandBuffers[imageIdx], info.indexBuffer, 0, VK_INDEX_TYPE_UINT16);
-
-         vkCmdDrawIndexed(commandBuffers[imageIdx], static_cast<uint32_t>(info.numIndices), 1, 0, 0, 0);
       }
 
@@ -1829 +1825 @@
          createImageViews();
          createRenderPass();
-
-         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", scenePipeline);
-         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", overlayPipeline);
-
+         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", &scenePipeline.pipeline);
+         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", &overlayPipeline.pipeline);
          createDepthResources();
          createFramebuffers();
          createUniformBuffers();
-
-         createDescriptorPool(scenePipeline);
-         createDescriptorSets(scenePipeline);
-
-         createDescriptorPool(overlayPipeline);
-         createDescriptorSets(overlayPipeline);
-
+         createDescriptorPool();
+         createDescriptorSets();
          createCommandBuffers();
       }
@@ -1863 +1852 @@
          vkFreeMemory(device, sdlOverlayImageMemory, nullptr);
 
-         cleanupPipelineBuffers(scenePipeline);
-         cleanupPipelineBuffers(overlayPipeline);
+         vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
+
+         vkDestroyBuffer(device, scenePipeline.vertexBuffer, nullptr);
+         vkFreeMemory(device, scenePipeline.vertexBufferMemory, nullptr);
+         vkDestroyBuffer(device, scenePipeline.indexBuffer, nullptr);
+         vkFreeMemory(device, scenePipeline.indexBufferMemory, nullptr);
+
+         vkDestroyBuffer(device, overlayPipeline.vertexBuffer, nullptr);
+         vkFreeMemory(device, overlayPipeline.vertexBufferMemory, nullptr);
+         vkDestroyBuffer(device, overlayPipeline.indexBuffer, nullptr);
+         vkFreeMemory(device, overlayPipeline.indexBufferMemory, nullptr);
 
          for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
@@ -1923 +1921 @@
          vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
 
-         cleanupPipeline(scenePipeline);
-         cleanupPipeline(overlayPipeline);
-
+         vkDestroyPipeline(device, scenePipeline.pipeline, nullptr);
+         vkDestroyPipeline(device, overlayPipeline.pipeline, nullptr);
+
+         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
          vkDestroyRenderPass(device, renderPass, nullptr);
 
@@ -1938 +1937 @@
             vkFreeMemory(device, uniformBuffersMemory[i], nullptr);
          }
-      }
-
-      void cleanupPipeline(GraphicsPipelineInfo& pipeline) {
-         vkDestroyPipeline(device, pipeline.pipeline, nullptr);
-         vkDestroyDescriptorPool(device, pipeline.descriptorPool, nullptr);
-         vkDestroyPipelineLayout(device, pipeline.pipelineLayout, nullptr);
-      }
-
-      void cleanupPipelineBuffers(GraphicsPipelineInfo& pipeline) {
-         vkDestroyDescriptorSetLayout(device, pipeline.descriptorSetLayout, nullptr);
-
-         vkDestroyBuffer(device, pipeline.vertexBuffer, nullptr);
-         vkFreeMemory(device, pipeline.vertexBufferMemory, nullptr);
-         vkDestroyBuffer(device, pipeline.indexBuffer, nullptr);
-         vkFreeMemory(device, pipeline.indexBufferMemory, nullptr);
+
+         vkDestroyDescriptorPool(device, descriptorPool, nullptr);
       }