lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 09:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan replay: omit zero size vkMapMemory calls.

Browse Source 
The spec for `vkMapMemory` requires that `size` must be greater than 0.
However, `vkFlushMappedMemoryRanges` may include `VkMappedMemoryRange`s
with `size` equal to 0.

RenderDoc replays `vkFlushMappedMemoryRanges` by calling`vkMapMemory`,
copying the data, and then calling `vkUnmapMemory`. This can turn valid
`vkFlushMappedMemoryRanges` into invalid `vkMapMemory` calls.

This fix skips the `vkMapMemory` (and corresponding `vkUnmapMemory`
calls) for zero size ranges.

Change-Id: I08fd40f36f2c63e28f3df42bc799981b5eb35295
This commit is contained in:
Benson Joeris
2019-11-25 11:42:40 -05:00
committed by Baldur Karlsson
parent 9ff7b04f6f
commit 05b2afd164
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+2 -2
View File
@@ -720,7 +720,7 @@ bool WrappedVulkan::Serialise_vkFlushMappedMemoryRanges(SerialiserType &ser, VkD
MappedData = state->mappedPtr + (size_t)MemRange.offset;
}
if(IsReplayingAndReading() && MemRange.memory != VK_NULL_HANDLE)
if(IsReplayingAndReading() && MemRange.memory != VK_NULL_HANDLE && MemRange.size > 0)
{
VkResult ret =
ObjDisp(device)->MapMemory(Unwrap(device), Unwrap(MemRange.memory), MemRange.offset,
@@ -733,7 +733,7 @@ bool WrappedVulkan::Serialise_vkFlushMappedMemoryRanges(SerialiserType &ser, VkD
// directly into upload memory
ser.Serialise("MappedData"_lit, MappedData, memRangeSize, SerialiserFlags::NoFlags);
if(IsReplayingAndReading() && MappedData && MemRange.memory != VK_NULL_HANDLE)
if(IsReplayingAndReading() && MappedData && MemRange.memory != VK_NULL_HANDLE && MemRange.size > 0)
ObjDisp(device)->UnmapMemory(Unwrap(device), Unwrap(MemRange.memory));
SERIALISE_CHECK_READ_ERRORS();