Destroy_Functions_and_Resizing_Error (#95)

* Resizing_Error

* Destroy functions

Author: azer89

HelloVulkan/Header/Vulkan/VulkanBuffer.h

@@ -36,6 +36,8 @@ class VulkanBuffer
 		if (vmaAllocation_)
 		{
 			vmaDestroyBuffer(vmaAllocator_, buffer_, vmaAllocation_);
+			buffer_ = nullptr;
+			vmaAllocation_ = nullptr;
 		}
 	}
 

HelloVulkan/Source/Apps/AppBase.cpp

@@ -368,6 +368,9 @@ void AppBase::ProcessInput()
 
 void AppBase::InitSharedResources()
 {
-	resShared_ = std::make_unique<ResourcesShared>();
+	if (!resShared_)
+	{
+		resShared_ = std::make_unique<ResourcesShared>();
+	}
 	resShared_->Create(vulkanContext_);
 }

HelloVulkan/Source/Vulkan/VulkanAccelStructure.cpp

@@ -33,10 +33,13 @@ void VulkanAccelStructure::Destroy()
 	if (vmaAllocation_)
 	{
 		vmaDestroyBuffer(vmaAllocator_, buffer_, vmaAllocation_);
+		buffer_ = nullptr;
+		vmaAllocation_ = nullptr;
 	}
 
 	if (handle_)
 	{
 		vkDestroyAccelerationStructureKHR(device_, handle_, nullptr);
+		handle_ = nullptr;
 	}
 }

HelloVulkan/Source/Vulkan/VulkanDescriptor.cpp

@@ -193,11 +193,13 @@ void VulkanDescriptor::Destroy()
 	if (layout_)
 	{
 		vkDestroyDescriptorSetLayout(device_, layout_, nullptr);
+		layout_ = nullptr;
 	}
 
 	if (pool_)
 	{
 		vkDestroyDescriptorPool(device_, pool_, nullptr);
+		pool_ = nullptr;
 	}
 }
 

HelloVulkan/Source/Vulkan/VulkanFramebuffer.cpp

@@ -64,9 +64,10 @@ void VulkanFramebuffer::CreateUnresizeable(
 
 void VulkanFramebuffer::Destroy()
 {
-	for (VkFramebuffer& f : framebuffers_)
+	for (size_t i = 0; i < framebuffers_.size(); ++i)
 	{
-		vkDestroyFramebuffer(device_, f, nullptr);
+		vkDestroyFramebuffer(device_, framebuffers_[i], nullptr);
+		framebuffers_[i] = nullptr;
 	}
 	// NOTE Don't clear because we may recreate
 	//framebuffers_.clear();

HelloVulkan/Source/Vulkan/VulkanImage.cpp

@@ -12,16 +12,20 @@ void VulkanImage::Destroy()
 	if (defaultImageSampler_)
 	{
 		vkDestroySampler(device_, defaultImageSampler_, nullptr);
+		defaultImageSampler_ = nullptr;
 	}
 
 	if (imageView_)
 	{
 		vkDestroyImageView(device_, imageView_, nullptr);
+		imageView_ = nullptr;
 	}
 
 	if (vmaAllocation_)
 	{
 		vmaDestroyImage(vmaAllocator_, image_, vmaAllocation_);
+		image_ = nullptr;
+		vmaAllocation_ = nullptr;
 	}
 }
 

HelloVulkan/Source/Vulkan/VulkanRenderPass.cpp

@@ -577,5 +577,6 @@ void VulkanRenderPass::Destroy()
 	if (handle_)
 	{
 		vkDestroyRenderPass(device_, handle_, nullptr);
+		handle_ = nullptr;
 	}
 }

HelloVulkan/Source/Vulkan/VulkanShader.cpp

@@ -38,6 +38,7 @@ void VulkanShader::Destroy()
 	if (shaderModule_)
 	{
 		vkDestroyShaderModule(device_, shaderModule_, nullptr);
+		shaderModule_ = nullptr;
 	}
 }