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

Add a workaround for macOS to avoid serialising size_t

Browse Source 
* We never should have serialised size_t in the first place so this shouldn't
  have happened, but since we want to keep some semblence of best-effort
  backwards compatibility, we'll keep the code and just disable it on macOS.
This commit is contained in:
baldurk
2018-09-02 12:54:57 +01:00
parent 21de779509
commit 9a1b8ef87d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_serialise.cpp
+12 -4
View File
@@ -2236,11 +2236,17 @@ void DoSerialise(SerialiserType &ser, VkDescriptorUpdateTemplateEntry &el)
SERIALISE_MEMBER(descriptorCount);
SERIALISE_MEMBER(descriptorType);
// these fields are size_t and should not be serialised as-is. They're not used so we can just
// serialise them as uint64_t. Unfortunately this wasn't correct initially and they were
// serialised as-is making a 32-bit/64-bit incompatibility, so for older versions all we can do is
// continue to serialise them as size_t as it's impossible to know which one was used.
// these fields are size_t and should not be serialised as-is. They're not used so we can just
// serialise them as uint64_t. Unfortunately this wasn't correct initially and they were
// serialised as-is making a 32-bit/64-bit incompatibility, so for older versions all we can do is
// continue to serialise them as size_t as it's impossible to know which one was used.
//
// On mac we can't compile a size_t serialise, which is good in general but makes this backwards
// compatibility a bit more annoying. We just assume a 64-bit capture.
#if DISABLED(RDOC_APPLE)
if(ser.VersionAtLeast(0xE))
#endif
{
uint64_t offset = el.offset;
uint64_t stride = el.stride;
@@ -2249,11 +2255,13 @@ void DoSerialise(SerialiserType &ser, VkDescriptorUpdateTemplateEntry &el)
el.offset = (size_t)offset;
el.stride = (size_t)stride;
}
#if DISABLED(RDOC_APPLE)
else
{
SERIALISE_MEMBER(offset);
SERIALISE_MEMBER(stride);
}
#endif
}
template <typename SerialiserType>