Handle oldSwapchains

src/Vulkan/libVulkan.cpp

@@ -2172,6 +2172,16 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(VkDevice device, const VkSwa
 	TRACE("(VkDevice device = 0x%X, const VkSwapchainCreateInfoKHR* pCreateInfo = 0x%X, const VkAllocationCallbacks* pAllocator = 0x%X, VkSwapchainKHR* pSwapchain = 0x%X)",
 			device, pCreateInfo, pAllocator, pSwapchain);
 
+	if(pCreateInfo->oldSwapchain)
+	{
+		vk::Cast(pCreateInfo->oldSwapchain)->retire();
+	}
+
+	if(vk::Cast(pCreateInfo->surface)->getAssociatedSwapchain() != VK_NULL_HANDLE)
+	{
+		return VK_ERROR_NATIVE_WINDOW_IN_USE_KHR;
+	}
+
 	VkResult status = vk::SwapchainKHR::Create(pAllocator, pCreateInfo, pSwapchain);
 
 	if(status != VK_SUCCESS)
@@ -2187,6 +2197,8 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(VkDevice device, const VkSwa
 		return status;
 	}
 
+	vk::Cast(pCreateInfo->surface)->associateSwapchain(*pSwapchain);
+
 	return VK_SUCCESS;
 }
 

src/WSI/VkSurfaceKHR.cpp

@@ -83,4 +83,19 @@ VkResult SurfaceKHR::getPresentModes(uint32_t *pPresentModeCount, VkPresentModeK
 	return VK_SUCCESS;
 }
 
+void SurfaceKHR::associateSwapchain(VkSwapchainKHR swapchain)
+{
+	associatedSwapchain = swapchain;
+}
+
+void SurfaceKHR::disassociateSwapchain()
+{
+	associatedSwapchain = VK_NULL_HANDLE;
+}
+
+VkSwapchainKHR SurfaceKHR::getAssociatedSwapchain()
+{
+	return associatedSwapchain;
+}
+
 }
\ No newline at end of file

src/WSI/VkSurfaceKHR.hpp

@@ -64,7 +64,14 @@ public:
 	virtual void detachImage(PresentImage* image) = 0;
 	virtual void present(PresentImage* image) = 0;
 
+	void associateSwapchain(VkSwapchainKHR swapchain);
+	void disassociateSwapchain();
+	VkSwapchainKHR getAssociatedSwapchain();
+
+
 private:
+	VkSwapchainKHR associatedSwapchain;
+
 	const std::vector<VkSurfaceFormatKHR> surfaceFormats =
 	{
 		{VK_FORMAT_B8G8R8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},

src/WSI/VkSwapchainKHR.cpp

@@ -24,7 +24,8 @@ namespace vk
 {
 
 SwapchainKHR::SwapchainKHR(const VkSwapchainCreateInfoKHR *pCreateInfo, void *mem) :
-	createInfo(*pCreateInfo)
+	createInfo(*pCreateInfo),
+	retired(false)
 {
 	images.resize(pCreateInfo->minImageCount);
 	resetImages();
@@ -43,6 +44,11 @@ void SwapchainKHR::destroy(const VkAllocationCallbacks *pAllocator)
 			currentImage.imageStatus = NONEXISTENT;
 		}
 	}
+
+	if(!retired)
+	{
+		vk::Cast(createInfo.surface)->disassociateSwapchain();
+	}
 }
 
 size_t SwapchainKHR::ComputeRequiredAllocationSize(const VkSwapchainCreateInfoKHR *pCreateInfo)
@@ -50,6 +56,27 @@ size_t SwapchainKHR::ComputeRequiredAllocationSize(const VkSwapchainCreateInfoKH
 	return 0;
 }
 
+void SwapchainKHR::retire()
+{
+	if(!retired)
+	{
+		retired = true;
+		vk::Cast(createInfo.surface)->disassociateSwapchain();
+
+		for(auto& currentImage : images)
+		{
+			if(currentImage.imageStatus == AVAILABLE)
+			{
+				vk::Cast(createInfo.surface)->detachImage(&currentImage);
+				vk::destroy(currentImage.imageMemory, nullptr);
+				vk::destroy(currentImage.image, nullptr);
+
+				currentImage.imageStatus = NONEXISTENT;
+			}
+		}
+	}
+}
+
 void SwapchainKHR::resetImages()
 {
 	for(auto& currentImage : images)
@@ -182,6 +209,15 @@ void SwapchainKHR::present(uint32_t index)
 	image.imageStatus = PRESENTING;
 	vk::Cast(createInfo.surface)->present(&image);
 	image.imageStatus = AVAILABLE;
+
+	if(retired)
+	{
+		vk::Cast(createInfo.surface)->detachImage(&image);
+		vk::destroy(image.imageMemory, nullptr);
+		vk::destroy(image.image, nullptr);
+
+		image.imageStatus = NONEXISTENT;
+	}
 }
 
 }
\ No newline at end of file

src/WSI/VkSwapchainKHR.hpp

@@ -35,6 +35,8 @@ public:
 
 	static size_t ComputeRequiredAllocationSize(const VkSwapchainCreateInfoKHR* pCreateInfo);
 
+	void retire();
+
 	VkResult createImages(VkDevice device);
 
 	uint32_t getImageCount() const;
@@ -47,6 +49,7 @@ public:
 private:
 	VkSwapchainCreateInfoKHR createInfo;
 	std::vector<PresentImage> images;
+	bool retired;
 
 	void resetImages();
 };