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

Change array serialisation functions to explicitly be uint32/uint64.

Browse Source
This commit is contained in:
baldurk
2015-09-02 09:00:00 +02:00
parent a763656302
commit 65dbac28f0
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/serialise/serialiser.h
+19 -10
View File
@@ -341,7 +341,7 @@ class Serialiser
template<int Num, class T>
void SerialisePODArray(const char *name, T *el)
{
size_t n = Num;
uint32_t n = (uint32_t)Num;
SerialisePODArray(name, el, n);
}
@@ -351,10 +351,8 @@ class Serialiser
// If serialising in, el must either be NULL in which case allocated
// memory will be returned, or it must be already large enough.
template<class T>
void SerialisePODArray(const char *name, T *&el, size_t &Num)
void SerialisePODArray(const char *name, T *&el, uint32_t &numElems)
{
uint32_t numElems = (uint32_t)Num;
if(m_Mode == WRITING)
{
WriteFrom(numElems);
@@ -373,16 +371,26 @@ class Serialiser
memcpy(el, ReadBytes(length), length);
}
}
Num = (size_t)numElems;
if(name != NULL && m_DebugTextWriting)
{
for(size_t i=0; i < Num; i++)
if(numElems == 0)
DebugPrint("%s[0]", name);
for(size_t i=0; i < numElems; i++)
DebugPrint("%s[%d] = %s\n", name, i, ToStr::Get<T>(el[i]).c_str());
}
}
// overload for 64-bit counts
template<class T>
void SerialisePODArray(const char *name, T *&el, uint64_t &Num)
{
uint32_t n = (uint32_t)Num;
SerialisePODArray(name, el, n);
Num = n;
}
// serialise a normal array. Typically this should be a small array,
// for large byte buffers use SerialiseBuffer which is optimised for that
//
@@ -401,8 +409,6 @@ class Serialiser
{
ReadInto(Num);
RDCASSERT(el == NULL);
if(Num > 0)
{
el = new T[Num];
@@ -415,13 +421,16 @@ class Serialiser
el = NULL;
}
}
if(name != NULL && m_DebugTextWriting && Num == 0)
DebugPrint("%s[0]", name);
}
// overload for 64-bit counts
template<class T>
void SerialiseComplexArray(const char *name, T *&el, uint64_t &Num)
{
uint32_t n;
uint32_t n = (uint32_t)Num;
SerialiseComplexArray(name, el, n);
Num = n;
}