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

Merge pull request #19 from rextimmy/apple

Browse Source 
Apple support
This commit is contained in:
Adam Sawicki 2018-02-27 11:22:31 +01:00 committed by GitHub
commit 1240398638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/vk_mem_alloc.h
View File

@ -1739,10 +1739,20 @@ remove them if not needed.
#include <mutex> // for std::mutex #include <mutex> // for std::mutex
#include <atomic> // for std::atomic #include <atomic> // for std::atomic
#if !defined(_WIN32) #if !defined(_WIN32) && !defined(__APPLE__)
#include <malloc.h> // for aligned_alloc() #include <malloc.h> // for aligned_alloc()
#endif #endif
#if defined(__APPLE__)
#include <cstdlib>
void *aligned_alloc(size_t alignment, size_t size)
{
void *pointer;
posix_memalign(&pointer, alignment, size);
return pointer;
}
#endif
// Normal assert to check for programmer's errors, especially in Debug configuration. // Normal assert to check for programmer's errors, especially in Debug configuration.
#ifndef VMA_ASSERT #ifndef VMA_ASSERT
#ifdef _DEBUG #ifdef _DEBUG
@ -4964,7 +4974,7 @@ void VmaBlockMetadata::PrintDetailedMap(class VmaJsonWriter& json) const
json.WriteNumber(m_SumFreeSize); json.WriteNumber(m_SumFreeSize);
json.WriteString("Allocations"); json.WriteString("Allocations");
json.WriteNumber(m_Suballocations.size() - m_FreeCount); json.WriteNumber((uint64_t)m_Suballocations.size() - m_FreeCount);
json.WriteString("UnusedRanges"); json.WriteString("UnusedRanges");
json.WriteNumber(m_FreeCount); json.WriteNumber(m_FreeCount);
@ -6322,7 +6332,7 @@ size_t VmaBlockVector::CalcMaxBlockSize() const
size_t result = 0; size_t result = 0;
for(size_t i = m_Blocks.size(); i--; ) for(size_t i = m_Blocks.size(); i--; )
{ {
result = VMA_MAX(result, m_Blocks[i]->m_Metadata.GetSize()); result = VMA_MAX((uint64_t)result, (uint64_t)m_Blocks[i]->m_Metadata.GetSize());
if(result >= m_PreferredBlockSize) if(result >= m_PreferredBlockSize)
{ {
break; break;
@ -6408,15 +6418,15 @@ void VmaBlockVector::PrintDetailedMap(class VmaJsonWriter& json)
if(m_MinBlockCount > 0) if(m_MinBlockCount > 0)
{ {
json.WriteString("Min"); json.WriteString("Min");
json.WriteNumber(m_MinBlockCount); json.WriteNumber((uint64_t)m_MinBlockCount);
} }
if(m_MaxBlockCount < SIZE_MAX) if(m_MaxBlockCount < SIZE_MAX)
{ {
json.WriteString("Max"); json.WriteString("Max");
json.WriteNumber(m_MaxBlockCount); json.WriteNumber((uint64_t)m_MaxBlockCount);
} }
json.WriteString("Cur"); json.WriteString("Cur");
json.WriteNumber(m_Blocks.size()); json.WriteNumber((uint64_t)m_Blocks.size());
json.EndObject(); json.EndObject();
if(m_FrameInUseCount > 0) if(m_FrameInUseCount > 0)