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

Fix memory alignment checks and error message format strings. Refs #821

Browse Source
This commit is contained in:
baldurk
2017-12-14 18:51:05 +00:00
parent 0c10b20bc6
commit 92aaf0d547
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+6 -6
View File
@@ -889,14 +889,14 @@ bool WrappedVulkan::Serialise_vkBindBufferMemory(SerialiserType &ser, VkDevice d
}
// verify offset alignment
if((memoryOffset & mrq.alignment) != 0)
if((memoryOffset % mrq.alignment) != 0)
{
RDCERR(
"Trying to bind buffer %llu to memory %llu which is type %u, "
"but offset 0x%llx doesn't satisfy alignment 0x%llx.\n"
"This is most likely caused by incompatible hardware or drivers between capture and "
"replay, causing a change in memory requirements.",
resOrigId, memOrigId, memoryOffset, mrq.alignment);
resOrigId, memOrigId, memInfo.memoryTypeIndex, memoryOffset, mrq.alignment);
m_FailedReplayStatus = ReplayStatus::APIHardwareUnsupported;
return false;
}
@@ -909,7 +909,7 @@ bool WrappedVulkan::Serialise_vkBindBufferMemory(SerialiserType &ser, VkDevice d
"but at offset 0x%llx the reported size of 0x%llx won't fit the 0x%llx bytes of memory.\n"
"This is most likely caused by incompatible hardware or drivers between capture and "
"replay, causing a change in memory requirements.",
resOrigId, memOrigId, memoryOffset, mrq.size, memInfo.size);
resOrigId, memOrigId, memInfo.memoryTypeIndex, memoryOffset, mrq.size, memInfo.size);
m_FailedReplayStatus = ReplayStatus::APIHardwareUnsupported;
return false;
}
@@ -1000,14 +1000,14 @@ bool WrappedVulkan::Serialise_vkBindImageMemory(SerialiserType &ser, VkDevice de
}
// verify offset alignment
if((memoryOffset & mrq.alignment) != 0)
if((memoryOffset % mrq.alignment) != 0)
{
RDCERR(
"Trying to bind image %llu to memory %llu which is type %u, "
"but offset 0x%llx doesn't satisfy alignment 0x%llx.\n"
"This is most likely caused by incompatible hardware or drivers between capture and "
"replay, causing a change in memory requirements.",
resOrigId, memOrigId, memoryOffset, mrq.alignment);
resOrigId, memOrigId, memInfo.memoryTypeIndex, memoryOffset, mrq.alignment);
m_FailedReplayStatus = ReplayStatus::APIHardwareUnsupported;
return false;
}
@@ -1020,7 +1020,7 @@ bool WrappedVulkan::Serialise_vkBindImageMemory(SerialiserType &ser, VkDevice de
"but at offset 0x%llx the reported size of 0x%llx won't fit the 0x%llx bytes of memory.\n"
"This is most likely caused by incompatible hardware or drivers between capture and "
"replay, causing a change in memory requirements.",
resOrigId, memOrigId, memoryOffset, mrq.size, memInfo.size);
resOrigId, memOrigId, memInfo.memoryTypeIndex, memoryOffset, mrq.size, memInfo.size);
m_FailedReplayStatus = ReplayStatus::APIHardwareUnsupported;
return false;
}