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

Fix calculation for aligning next serialised buffer. Refs #133

Browse Source
This commit is contained in:
baldurk
2015-04-28 12:21:36 +02:00
parent c58c406b20
commit 3dac5fe624
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/serialise/serialiser.cpp
+16 -5
View File
@@ -951,15 +951,17 @@ void Serialiser::AlignNextBuffer(const size_t alignment)
// Note the chunk still needs to be aligned when the memory is allocated - this just ensures
// the offset from the start is also aligned
size_t len = 0;
uint32_t len = 0;
if(m_Mode >= WRITING)
{
// add sizeof(uint32_t) since we'll be serialising out how much padding is here
uint64_t curoffs = GetOffset() + sizeof(uint32_t);
// add sizeof(uint32_t) since we'll be serialising out how much padding is here,
// then another sizeof(uint32_t) so we're aligning the offset after the buffer's
// serialised length
uint64_t curoffs = GetOffset() + sizeof(uint32_t)*2;
uint64_t alignedoffs = AlignUp(curoffs, (uint64_t)alignment);
len = size_t(alignedoffs - curoffs);
len = uint32_t(alignedoffs - curoffs);
}
// avoid dynamically allocating
@@ -967,7 +969,16 @@ void Serialiser::AlignNextBuffer(const size_t alignment)
byte padding[128] = {0};
byte *p = &padding[0];
SerialiseBuffer("", p, len);
if(m_Mode >= WRITING)
{
WriteFrom(len);
WriteBytes(&padding[0], (size_t)len);
}
else
{
ReadInto(len);
ReadBytes(len);
}
}
void Serialiser::SerialiseBuffer(const char *name, byte *&buf, size_t &len)