Additional fix as suggested in #69

This commit is contained in:
Adam Sawicki 2019-06-28 17:31:21 +02:00
parent 77fa9dc840
commit c238be5070

View File

@ -3725,7 +3725,7 @@ static inline bool VmaIsBufferImageGranularityConflict(
static void VmaWriteMagicValue(void* pData, VkDeviceSize offset) static void VmaWriteMagicValue(void* pData, VkDeviceSize offset)
{ {
#if VMA_DEBUG_MARGIN > 0 #if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION
uint32_t* pDst = (uint32_t*)((char*)pData + offset); uint32_t* pDst = (uint32_t*)((char*)pData + offset);
const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t);
for(size_t i = 0; i < numberCount; ++i, ++pDst) for(size_t i = 0; i < numberCount; ++i, ++pDst)
@ -3733,13 +3733,13 @@ static void VmaWriteMagicValue(void* pData, VkDeviceSize offset)
*pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE; *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE;
} }
#else #else
// no-op // no-op
#endif #endif
} }
static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset) static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset)
{ {
#if VMA_DEBUG_MARGIN > 0 #if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION
const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset); const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset);
const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t);
for(size_t i = 0; i < numberCount; ++i, ++pSrc) for(size_t i = 0; i < numberCount; ++i, ++pSrc)