AuroraMiddleware/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator synced 2024-11-05 12:20:07 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for compilation under Linux gcc and clang.

Browse Source
This commit is contained in:
Adam Sawicki 2018-08-27 12:21:35 +02:00
parent 2b3e416cdf
commit 6277abb3c4
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/vk_mem_alloc.h
View File

@ -3060,9 +3060,13 @@ static void VmaWriteMagicValue(void* pData, VkDeviceSize offset)
{ {
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) // This condition is to silence clang compiler error: "comparison of unsigned expression < 0 is always false"
if(numberCount > 0)
{ {
*pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE; for(size_t i = 0; i < numberCount; ++i, ++pDst)
{
*pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE;
}
} }
} }
@ -3070,11 +3074,15 @@ static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset)
{ {
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) // This condition is to silence clang compiler error: "comparison of unsigned expression < 0 is always false"
if(numberCount > 0)
{ {
if(*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE) for(size_t i = 0; i < numberCount; ++i, ++pSrc)
{ {
return false; if(*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE)
{
return false;
}
} }
} }
return true; return true;
@ -3513,10 +3521,10 @@ template<typename CmpLess, typename IterT, typename KeyT>
IterT VmaVectorFindSorted(const IterT& beg, const IterT& end, const KeyT& value) IterT VmaVectorFindSorted(const IterT& beg, const IterT& end, const KeyT& value)
{ {
CmpLess comparator; CmpLess comparator;
typename IterT it = VmaBinaryFindFirstNotLess<CmpLess, IterT, KeyT>( IterT it = VmaBinaryFindFirstNotLess<CmpLess, IterT, KeyT>(
beg, end, value, comparator); beg, end, value, comparator);
if(it == end || if(it == end ||
!comparator(*it, value) && !comparator(value, *it)) (!comparator(*it, value) && !comparator(value, *it)))
{ {
return it; return it;
} }
@ -8634,8 +8642,8 @@ bool VmaBlockMetadata_Linear::CreateAllocationRequest(
} }
// There is enough free space at the end after alignment. // There is enough free space at the end after alignment.
if(index1st == suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN < size || if((index1st == suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN < size) ||
index1st < suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN <= suballocations1st[index1st].offset) (index1st < suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN <= suballocations1st[index1st].offset))
{ {
// Check next suballocations for BufferImageGranularity conflicts. // Check next suballocations for BufferImageGranularity conflicts.
// If conflict exists, allocation cannot be made here. // If conflict exists, allocation cannot be made here.