Fix memory leak in vkDestroyImage

When swapchain images were being destroyed on Android, the backing memory was not being destroyed, causing a crash. Tests: dEQP-VK.wsi.android.swapchain.create.min_image_count Bug: 133346002 Change-Id: Ib2383a6c41ac2917f6e6630eca96e5c180996507 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/31870Reviewed-by: Chris Forbes <chrisforbes@google.com> Tested-by: Hernan Liatis <hliatis@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Fix memory leak in vkDestroyImage
f988cb53 · Hernan Liatis · 29364a05 · f988cb53
Commit f988cb53 authored May 22, 2019 by Hernan Liatis
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

libVulkan.cpp src/Vulkan/libVulkan.cpp +10 -0

No files found.
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -1053,6 +1053,16 @@ VKAPI_ATTR void VKAPI_CALL vkDestroyImage(VkDevice device, VkImage image, const 
 		    device, image.get(), pAllocator);

 	vk::destroy(image, pAllocator);
+
+#ifdef __ANDROID__
+	auto it = androidSwapchainMap.find(image);
+
+	if (it != androidSwapchainMap.end())
+	{
+		vk::destroy((it->second).imageMemory, nullptr);
+		androidSwapchainMap.erase(it);
+	}
+#endif
 }

 VKAPI_ATTR void VKAPI_CALL vkGetImageSubresourceLayout(VkDevice device, VkImage image, const VkImageSubresource* pSubresource, VkSubresourceLayout* pLayout)