Changeset 603b5bc in opengl-game for vulkan-game.cpp

Timestamp:

Oct 22, 2019, 7:53:48 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

34bdf3a

Parents:

e83b155

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (10/22/19 19:10:44)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (10/22/19 19:53:48)

Message:

In vulkangame, add code to create the frame buffers and command buffers

File:

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

vulkan-game.cpp

@@ -133 +133 @@
    createCommandPool();
 
-   createVulkanResources();
-
-   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device, renderPass, viewport, sizeof(Vertex)));
+   createImageResources();
+
+   createFramebuffers();
+   createUniformBuffers();
+
+   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device, renderPass,
+      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(Vertex)));
 
    graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&Vertex::pos));
@@ -151 +155 @@
    graphicsPipelines.back().createDescriptorSets(swapChainImages);
 
-   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device, renderPass, viewport, sizeof(OverlayVertex)));
+   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device, renderPass,
+      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(OverlayVertex)));
 
    graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&OverlayVertex::pos));
@@ -163 +168 @@
    graphicsPipelines.back().createDescriptorPool(swapChainImages);
    graphicsPipelines.back().createDescriptorSets(swapChainImages);
+
+   createCommandBuffers();
+
+   // TODO: Creating the descriptor pool and descriptor sets might need to be redone when the
+   // swap chain is recreated
 
    cout << "Created " << graphicsPipelines.size() << " graphics pipelines" << endl;
@@ -496 +506 @@
 
    swapChainImageFormat = surfaceFormat.format;
-   viewport = { 0, 0, (int)extent.width, (int)extent.height };
+   swapChainExtent = extent;
 }
 
@@ -588 +598 @@
 }
 
-void VulkanGame::createVulkanResources() {
+void VulkanGame::createImageResources() {
+   VulkanUtils::createDepthImage(device, physicalDevice, commandPool, findDepthFormat(), swapChainExtent,
+      depthImage, graphicsQueue);
+
    createTextureSampler();
-   createUniformBuffers();
-
-   // TODO: Make sure that Vulkan complains about these images not being destroyed and then destroy them
 
    VulkanUtils::createVulkanImageFromFile(device, physicalDevice, commandPool, "textures/texture.jpg",
       floorTextureImage, graphicsQueue);
-   VulkanUtils::createVulkanImageFromSDLTexture(device, physicalDevice, uiOverlay, sdlOverlayImage);
 
    floorTextureImageDescriptor = {};
@@ -602 +611 @@
    floorTextureImageDescriptor.imageView = floorTextureImage.imageView;
    floorTextureImageDescriptor.sampler = textureSampler;
+
+   VulkanUtils::createVulkanImageFromSDLTexture(device, physicalDevice, uiOverlay, sdlOverlayImage);
 
    sdlOverlayImageDescriptor = {};
@@ -635 +646 @@
 }
 
+void VulkanGame::createFramebuffers() {
+   swapChainFramebuffers.resize(swapChainImageViews.size());
+
+   for (size_t i = 0; i < swapChainImageViews.size(); i++) {
+      array<VkImageView, 2> attachments = {
+         swapChainImageViews[i],
+         depthImage.imageView
+      };
+
+      VkFramebufferCreateInfo framebufferInfo = {};
+      framebufferInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
+      framebufferInfo.renderPass = renderPass;
+      framebufferInfo.attachmentCount = static_cast<uint32_t>(attachments.size());
+      framebufferInfo.pAttachments = attachments.data();
+      framebufferInfo.width = swapChainExtent.width;
+      framebufferInfo.height = swapChainExtent.height;
+      framebufferInfo.layers = 1;
+
+      if (vkCreateFramebuffer(device, &framebufferInfo, nullptr, &swapChainFramebuffers[i]) != VK_SUCCESS) {
+         throw runtime_error("failed to create framebuffer!");
+      }
+   }
+}
+
 void VulkanGame::createUniformBuffers() {
    VkDeviceSize bufferSize = sizeof(UniformBufferObject);
@@ -653 +688 @@
 }
 
+void VulkanGame::createCommandBuffers() {
+   commandBuffers.resize(swapChainImages.size());
+
+   VkCommandBufferAllocateInfo allocInfo = {};
+   allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
+   allocInfo.commandPool = commandPool;
+   allocInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+   allocInfo.commandBufferCount = (uint32_t) commandBuffers.size();
+
+   if (vkAllocateCommandBuffers(device, &allocInfo, commandBuffers.data()) != VK_SUCCESS) {
+      throw runtime_error("failed to allocate command buffers!");
+   }
+
+   for (size_t i = 0; i < commandBuffers.size(); i++) {
+      VkCommandBufferBeginInfo beginInfo = {};
+      beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+      beginInfo.flags = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
+      beginInfo.pInheritanceInfo = nullptr;
+
+      if (vkBeginCommandBuffer(commandBuffers[i], &beginInfo) != VK_SUCCESS) {
+         throw runtime_error("failed to begin recording command buffer!");
+      }
+
+      VkRenderPassBeginInfo renderPassInfo = {};
+      renderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
+      renderPassInfo.renderPass = renderPass;
+      renderPassInfo.framebuffer = swapChainFramebuffers[i];
+      renderPassInfo.renderArea.offset = { 0, 0 };
+      renderPassInfo.renderArea.extent = swapChainExtent;
+
+      array<VkClearValue, 2> clearValues = {};
+      clearValues[0].color = {{ 0.0f, 0.0f, 0.0f, 1.0f }};
+      clearValues[1].depthStencil = { 1.0f, 0 };
+
+      renderPassInfo.clearValueCount = static_cast<uint32_t>(clearValues.size());
+      renderPassInfo.pClearValues = clearValues.data();
+
+      vkCmdBeginRenderPass(commandBuffers[i], &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
+
+      // reateGraphicsPipelineCommands(scenePipeline, i);
+      // createGraphicsPipelineCommands(overlayPipeline, i);
+      for (GraphicsPipeline_Vulkan pipeline : graphicsPipelines) {
+         pipeline.createRenderCommands(commandBuffers[i], i);
+      }
+
+      vkCmdEndRenderPass(commandBuffers[i]);
+
+      if (vkEndCommandBuffer(commandBuffers[i]) != VK_SUCCESS) {
+         throw runtime_error("failed to record command buffer!");
+      }
+   }
+}
+
 void VulkanGame::cleanupSwapChain() {
+   VulkanUtils::destroyVulkanImage(device, depthImage);
+
+   for (VkFramebuffer framebuffer : swapChainFramebuffers) {
+      vkDestroyFramebuffer(device, framebuffer, nullptr);
+   }
+
+   vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
+
    for (GraphicsPipeline_Vulkan pipeline : graphicsPipelines) {
       pipeline.cleanup();
@@ -666 +762 @@
    vkDestroySwapchainKHR(device, swapChain, nullptr);
 
-   for (size_t i = 0; i < swapChainImages.size(); i++) {
+   for (size_t i = 0; i < uniformBuffers.size(); i++) {
       vkDestroyBuffer(device, uniformBuffers[i], nullptr);
       vkFreeMemory(device, uniformBuffersMemory[i], nullptr);