From 077638d0d60d95edb00160156180920a53dd5f9b Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sat, 14 May 2016 11:02:46 +0200
Subject: [PATCH] Silently ignore VK_NULL_HANDLE passed to vkDestroy* or
 vkFree*

---
 renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp     | 10 ++++++++++
 renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
index 8a9be89f2..670b24013 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
@@ -31,6 +31,7 @@
 #define DESTROY_IMPL(type, func) \
 	void WrappedVulkan::vk ## func(VkDevice device, type obj, const VkAllocationCallbacks* pAllocator) \
 	{ \
+		if(obj == VK_NULL_HANDLE) return; \
 		type unwrappedObj = Unwrap(obj); \
 		GetResourceManager()->ReleaseWrappedResource(obj, true); \
 		ObjDisp(device)->func(Unwrap(device), unwrappedObj, pAllocator); \
@@ -59,6 +60,9 @@ DESTROY_IMPL(VkRenderPass, DestroyRenderPass)
 // needs to be separate because it releases internal resources
 void WrappedVulkan::vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR obj, const VkAllocationCallbacks* pAllocator)
 {
+	if(obj == VK_NULL_HANDLE)
+		return;
+
 	// release internal rendering objects we created for rendering the overlay
 	{
 		SwapchainInfo &info = *GetRecord(obj)->swapInfo;
@@ -90,6 +94,9 @@ void WrappedVulkan::vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR obj, c
 // needs to be separate so we don't erase from m_ImageLayouts in other destroy functions
 void WrappedVulkan::vkDestroyImage(VkDevice device, VkImage obj, const VkAllocationCallbacks* pAllocator)
 {
+	if(obj == VK_NULL_HANDLE)
+		return;
+
 	{
 		SCOPED_LOCK(m_ImageLayoutsLock);
 		m_ImageLayouts.erase(GetResID(obj));
@@ -104,6 +111,9 @@ void WrappedVulkan::vkFreeCommandBuffers(VkDevice device, VkCommandPool commandP
 {
 	for(uint32_t c=0; c < commandBufferCount; c++)
 	{
+		if(pCommandBuffers[c] == VK_NULL_HANDLE)
+			continue;
+
 		WrappedVkDispRes *wrapped = (WrappedVkDispRes *)GetWrapped(pCommandBuffers[c]);
 
 		VkCommandBuffer unwrapped = wrapped->real.As<VkCommandBuffer>();
diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
index 41c05e8d7..b2c1e376d 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
@@ -327,6 +327,9 @@ void WrappedVulkan::vkFreeMemory(
 		VkDeviceMemory                              memory,
     const VkAllocationCallbacks*                pAllocator)
 {
+	if(memory == VK_NULL_HANDLE)
+		return;
+
 	// we just need to clean up after ourselves on replay
 	WrappedVkNonDispRes *wrapped = (WrappedVkNonDispRes *)GetWrapped(memory);