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

Support ARB_map_buffer_alignment on 64byte boundaries

Browse Source 
* The real implementation can do more if it wants, and align to a larger
  alignment, but we just return 64 to the program and align to that, which
  satisfies the extension minimum requirements (and chances are no program
  takes advantage of wider alignment anyway).
This commit is contained in:
baldurk
2014-12-26 16:04:22 +00:00
parent cd53d97418
commit f73a7a4a0c
7 changed files with 66 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/serialise/serialiser.cpp
+10 -5
View File
@@ -40,7 +40,7 @@ int64_t Chunk::m_MaxChunks = 0;
const uint32_t Serialiser::MAGIC_HEADER = MAKE_FOURCC('R', 'D', 'O', 'C');
const size_t Serialiser::BufferAlignment = 16;
Chunk::Chunk(Serialiser *ser, uint32_t chunkType, bool temporary)
Chunk::Chunk(Serialiser *ser, uint32_t chunkType, size_t alignment, bool temporary)
{
m_Length = (uint32_t)ser->GetOffset();
@@ -50,7 +50,12 @@ Chunk::Chunk(Serialiser *ser, uint32_t chunkType, bool temporary)
m_Temporary = temporary;
if(ser->HasAlignedData())
if(alignment)
{
m_Data = Serialiser::AllocAlignedBuffer(m_Length, alignment);
m_AlignedData = true;
}
else if(ser->HasAlignedData())
{
m_Data = Serialiser::AllocAlignedBuffer(m_Length);
m_AlignedData = true;
@@ -331,7 +336,7 @@ void Serialiser::ReadFromFile(uint64_t destOffs, size_t chunkLen)
FileIO::fread(m_Buffer + destOffs - m_ReadOffset, 1, chunkLen, m_ReadFileHandle);
}
byte *Serialiser::AllocAlignedBuffer(size_t size)
byte *Serialiser::AllocAlignedBuffer(size_t size, size_t alignment)
{
byte *rawAlloc = NULL;
@@ -339,7 +344,7 @@ byte *Serialiser::AllocAlignedBuffer(size_t size)
try
#endif
{
rawAlloc = new byte[size+sizeof(byte*)+16];
rawAlloc = new byte[size+sizeof(byte*)+alignment];
}
#if defined(__EXCEPTIONS) || defined(_CPPUNWIND)
catch(std::bad_alloc&)
@@ -353,7 +358,7 @@ byte *Serialiser::AllocAlignedBuffer(size_t size)
RDCASSERT(rawAlloc);
byte *alignedAlloc = (byte *)AlignUp16((size_t)(rawAlloc+sizeof(byte*)));
byte *alignedAlloc = (byte *)AlignUp((size_t)(rawAlloc+sizeof(byte*)), alignment);
byte **realPointer = (byte **)alignedAlloc;
realPointer[-1] = rawAlloc;