eden-emu/VulkanMemoryAllocator
18
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into allocation_defragmentation_strategies

Browse source 
# Conflicts:
#	docs/html/vk__mem__alloc_8h_source.html
This commit is contained in:
Adam Sawicki 2018-12-06 14:52:11 +01:00
commit 0eeed59309
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/vk_mem_alloc.h
View file

@ -1493,7 +1493,9 @@ available through VmaAllocatorCreateInfo::pRecordSettings.
#define NOMINMAX // For windows.h
#endif
#include <vulkan/vulkan.h>
#ifndef VULKAN_H_
#include <vulkan/vulkan.h>
#endif
#if VMA_RECORDING_ENABLED
#include <windows.h>
@ -1690,7 +1692,8 @@ typedef struct VmaAllocatorCreateInfo
smaller amount of memory, because graphics driver doesn't necessary fail new
allocations with `VK_ERROR_OUT_OF_DEVICE_MEMORY` result when memory capacity is
exceeded. It may return success and just silently migrate some device memory
blocks to system RAM.
blocks to system RAM. This driver behavior can also be controlled using
VK_AMD_memory_overallocation_behavior extension.
*/
const VkDeviceSize* pHeapSizeLimit;
/** \brief Pointers to Vulkan functions. Can be null if you leave define `VMA_STATIC_VULKAN_FUNCTIONS 1`.