eden-emu/VulkanMemoryAllocator
14
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2025-05-15 01:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Vulkan1_2'

Browse source
This commit is contained in:
Adam Sawicki 2020-03-02 15:43:47 +01:00
commit 8ef0d201ef
4 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/VulkanSample.cpp
View file

@ -32,8 +32,8 @@ static const char* const SHADER_PATH1 = "./";
static const char* const SHADER_PATH2 = "../bin/";
static const wchar_t* const WINDOW_CLASS_NAME = L"VULKAN_MEMORY_ALLOCATOR_SAMPLE";
static const char* const VALIDATION_LAYER_NAME = "VK_LAYER_LUNARG_standard_validation";
static const char* const APP_TITLE_A = "Vulkan Memory Allocator Sample 2.3.0";
static const wchar_t* const APP_TITLE_W = L"Vulkan Memory Allocator Sample 2.3.0";
static const char* const APP_TITLE_A = "Vulkan Memory Allocator Sample 2.4.0";
static const wchar_t* const APP_TITLE_W = L"Vulkan Memory Allocator Sample 2.4.0";
static const bool VSYNC = true;
static const uint32_t COMMAND_BUFFER_COUNT = 2;
@ -1118,7 +1118,16 @@ static void DestroySwapchain(bool destroyActualSwapchain)
static constexpr uint32_t GetVulkanApiVersion()
{
return VMA_VULKAN_VERSION == 1001000 ? VK_API_VERSION_1_1 : VK_API_VERSION_1_0;
#if VMA_VULKAN_VERSION == 1002000
return VK_API_VERSION_1_2;
#elif VMA_VULKAN_VERSION == 1001000
return VK_API_VERSION_1_1;
#elif VMA_VULKAN_VERSION == 1000000
return VK_API_VERSION_1_0;
#else
#error Invalid VMA_VULKAN_VERSION.
return UINT32_MAX;
#endif
}
void SetAllocatorCreateInfo(VmaAllocatorCreateInfo& outInfo)