From 55ceffcdd2f75db6edaac23f6e897e8c0ff5de01 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 10 Sep 2015 12:51:44 +0200 Subject: [PATCH] In SerialiseObject explicitly handle VK_NULL_HANDLE --- renderdoc/driver/vulkan/vk_common.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp index d5251f18e..df26131d9 100644 --- a/renderdoc/driver/vulkan/vk_common.cpp +++ b/renderdoc/driver/vulkan/vk_common.cpp @@ -1142,9 +1142,9 @@ string ToStrHelper::Get(const VkPresentModeWSI &el) #define SerialiseObject(type, name, obj) \ { \ ResourceId id; \ - if(m_Mode >= WRITING) id = MGR()->GetID(MakeRes(obj)); \ + if(m_Mode >= WRITING) id = (obj == VK_NULL_HANDLE) ? ResourceId() : MGR()->GetID(MakeRes(obj)); \ Serialise(name, id); \ - if(m_Mode < WRITING) obj = type(MGR()->GetLiveResource(id).handle); \ + if(m_Mode < WRITING) obj = (id == ResourceId()) ? VK_NULL_HANDLE : type(MGR()->GetLiveResource(id).handle); \ } static void SerialiseNext(Serialiser *ser, const void *&pNext)