From 58ac0ccfb2ed82f05bdce35b9be7b1fb85152cd7 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 24 Nov 2017 18:25:43 +0000 Subject: [PATCH] Compile fix for checking vulkan handle directly as bool --- renderdoc/driver/vulkan/vk_initstate.cpp | 2 +- renderdoc/driver/vulkan/vk_sparse_initstate.cpp | 4 ++-- renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp index 87e3f2d2c..280560b7c 100644 --- a/renderdoc/driver/vulkan/vk_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_initstate.cpp @@ -815,7 +815,7 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id, W ser.Serialise("Contents", Contents, ContentsSize, SerialiserFlags::NoFlags); // unmap the resource we mapped before - we need to do this on read and on write. - if(!IsStructuredExporting(m_State) && mappedMem) + if(!IsStructuredExporting(m_State) && mappedMem != VK_NULL_HANDLE) ObjDisp(d)->UnmapMemory(Unwrap(d), Unwrap(mappedMem)); SERIALISE_CHECK_READ_ERRORS(); diff --git a/renderdoc/driver/vulkan/vk_sparse_initstate.cpp b/renderdoc/driver/vulkan/vk_sparse_initstate.cpp index 1b66c5b48..f1874cb2b 100644 --- a/renderdoc/driver/vulkan/vk_sparse_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_sparse_initstate.cpp @@ -548,7 +548,7 @@ bool WrappedVulkan::Serialise_SparseBufferInitialState( ser.Serialise("Contents", Contents, ContentsSize, SerialiserFlags::NoFlags); // unmap the resource we mapped before - we need to do this on read and on write. - if(!IsStructuredExporting(m_State) && mappedMem) + if(!IsStructuredExporting(m_State) && mappedMem != VK_NULL_HANDLE) ObjDisp(d)->UnmapMemory(Unwrap(d), Unwrap(mappedMem)); SERIALISE_CHECK_READ_ERRORS(); @@ -653,7 +653,7 @@ bool WrappedVulkan::Serialise_SparseImageInitialState(SerialiserType &ser, Resou ser.Serialise("Contents", Contents, ContentsSize, SerialiserFlags::NoFlags); // unmap the resource we mapped before - we need to do this on read and on write. - if(!IsStructuredExporting(m_State) && mappedMem) + if(!IsStructuredExporting(m_State) && mappedMem != VK_NULL_HANDLE) ObjDisp(d)->UnmapMemory(Unwrap(d), Unwrap(mappedMem)); SERIALISE_CHECK_READ_ERRORS(); diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp index 28779132a..ff0bd744b 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp @@ -604,7 +604,7 @@ bool WrappedVulkan::Serialise_vkUnmapMemory(SerialiserType &ser, VkDevice device SERIALISE_ELEMENT(MapOffset); SERIALISE_ELEMENT(MapSize); - if(IsReplayingAndReading() && memory) + if(IsReplayingAndReading() && memory != VK_NULL_HANDLE) { VkResult vkr = ObjDisp(device)->MapMemory(Unwrap(device), Unwrap(memory), MapOffset, MapSize, 0, (void **)&MapData); @@ -616,7 +616,7 @@ bool WrappedVulkan::Serialise_vkUnmapMemory(SerialiserType &ser, VkDevice device // directly into upload memory ser.Serialise("MapData", MapData, MapSize, SerialiserFlags::NoFlags); - if(IsReplayingAndReading() && MapData && memory) + if(IsReplayingAndReading() && MapData && memory != VK_NULL_HANDLE) ObjDisp(device)->UnmapMemory(Unwrap(device), Unwrap(memory)); SERIALISE_CHECK_READ_ERRORS(); @@ -727,7 +727,7 @@ bool WrappedVulkan::Serialise_vkFlushMappedMemoryRanges(SerialiserType &ser, VkD MappedData = state->mappedPtr + (size_t)MemRange.offset; } - if(IsReplayingAndReading() && MemRange.memory) + if(IsReplayingAndReading() && MemRange.memory != VK_NULL_HANDLE) { VkResult ret = ObjDisp(device)->MapMemory(Unwrap(device), Unwrap(MemRange.memory), MemRange.offset, @@ -740,7 +740,7 @@ bool WrappedVulkan::Serialise_vkFlushMappedMemoryRanges(SerialiserType &ser, VkD // directly into upload memory ser.Serialise("MappedData", MappedData, memRangeSize, SerialiserFlags::NoFlags); - if(IsReplayingAndReading() && MappedData && MemRange.memory) + if(IsReplayingAndReading() && MappedData && MemRange.memory != VK_NULL_HANDLE) ObjDisp(device)->UnmapMemory(Unwrap(device), Unwrap(MemRange.memory)); SERIALISE_CHECK_READ_ERRORS();