Changeset e83b155 in opengl-game

Timestamp:

Oct 18, 2019, 2:40:47 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

603b5bc

Parents:

b794178

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (10/18/19 14:38:29)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (10/18/19 14:40:47)

Message:

In vulkangame, destroy the texture sampler, all the uniform buffer resources, and all the resources for each Vulkan image before terminating the program

Files:

• vulkan-game.cpp (modified) (2 diffs)
• vulkan-ref.cpp (modified) (6 diffs)
• vulkan-utils.cpp (modified) (1 diff)
• vulkan-utils.hpp (modified) (1 diff)

vulkan-game.cpp

@@ -231 +231 @@
    cleanupSwapChain();
 
+   VulkanUtils::destroyVulkanImage(device, floorTextureImage);
+   VulkanUtils::destroyVulkanImage(device, sdlOverlayImage);
+
+   vkDestroySampler(device, textureSampler, nullptr);
+
    for (GraphicsPipeline_Vulkan pipeline : graphicsPipelines) {
       pipeline.cleanupBuffers();
@@ -660 +665 @@
 
    vkDestroySwapchainKHR(device, swapChain, nullptr);
-}
+
+   for (size_t i = 0; i < swapChainImages.size(); i++) {
+      vkDestroyBuffer(device, uniformBuffers[i], nullptr);
+      vkFreeMemory(device, uniformBuffersMemory[i], nullptr);
+   }
+}

vulkan-ref.cpp

@@ -1965 +1965 @@
          createGraphicsPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv", scenePipeline);
          createDescriptorPool(scenePipeline);
-/*** END OF REFACTORED CODE ***/
          createDescriptorSets(scenePipeline);
 
-/*** START OF REFACTORED CODE ***/
          createGraphicsPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv", overlayPipeline);
          createDescriptorPool(overlayPipeline);
-/*** END OF REFACTORED CODE ***/
          createDescriptorSets(overlayPipeline);
+/*** END OF REFACTORED CODE ***/
 
          createCommandBuffers();
@@ -1980 +1978 @@
 /*** START OF REFACTORED CODE ***/
          cleanupSwapChain();
-/*** END OF REFACTORED CODE ***/
 
          vkDestroySampler(device, textureSampler, nullptr);
@@ -1992 +1989 @@
          vkFreeMemory(device, sdlOverlayImageMemory, nullptr);
 
-/*** START OF REFACTORED CODE ***/
          cleanupPipelineBuffers(scenePipeline);
          cleanupPipelineBuffers(overlayPipeline);
@@ -2068 +2064 @@
 
          vkDestroySwapchainKHR(device, swapChain, nullptr);
-/*** END OF REFACTORED CODE ***/
 
          for (size_t i = 0; i < swapChainImages.size(); i++) {
@@ -2076 +2071 @@
       }
 
-/*** START OF REFACTORED CODE ***/
       void cleanupPipeline(GraphicsPipelineInfo& pipeline) {
          vkDestroyPipeline(device, pipeline.pipeline, nullptr);
@@ -2082 +2076 @@
          vkDestroyPipelineLayout(device, pipeline.pipelineLayout, nullptr);
       }
-/*** END OF REFACTORED CODE ***/
 
       void cleanupPipelineBuffers(GraphicsPipelineInfo& pipeline) {
-/*** START OF REFACTORED CODE ***/
          vkDestroyDescriptorSetLayout(device, pipeline.descriptorSetLayout, nullptr);
 /*** END OF REFACTORED CODE ***/

vulkan-utils.cpp

@@ -475 +475 @@
    return format == VK_FORMAT_D32_SFLOAT_S8_UINT || format == VK_FORMAT_D24_UNORM_S8_UINT;
 }
+
+void VulkanUtils::destroyVulkanImage(VkDevice& device, VulkanImage& image) {
+   vkDestroyImageView(device, image.imageView, nullptr);
+   vkDestroyImage(device, image.image, nullptr);
+   vkFreeMemory(device, image.imageMemory, nullptr);
+}

vulkan-utils.hpp

@@ -83 +83 @@
 
       static bool hasStencilComponent(VkFormat format);
+
+      static void destroyVulkanImage(VkDevice& device, VulkanImage& image);
 };