diff --git a/src/CRE/Vulkan/shared.cpp b/src/CRE/Vulkan/shared.cpp index 322a3e5d..feccc424 100644 --- a/src/CRE/Vulkan/shared.cpp +++ b/src/CRE/Vulkan/shared.cpp @@ -7,7 +7,6 @@ #define VOLK_IMPLEMENTATION #define VMA_IMPLEMENTATION -#define VMA_VULKAN_VERSION 1000000 #include "shared.hpp" #include "gl_wrap.hpp" diff --git a/src/CRE/Vulkan/shared.hpp b/src/CRE/Vulkan/shared.hpp index 696ade16..88360a40 100644 --- a/src/CRE/Vulkan/shared.hpp +++ b/src/CRE/Vulkan/shared.hpp @@ -7,7 +7,7 @@ #include "../../KKdLib/default.hpp" #include -#define VMA_VULKAN_VERSION 1000000 +#define VMA_VULKAN_VERSION 1001000 #include namespace Vulkan { diff --git a/src/ReDIVA/app.cpp b/src/ReDIVA/app.cpp index cd518ff4..b3ce8f28 100644 --- a/src/ReDIVA/app.cpp +++ b/src/ReDIVA/app.cpp @@ -2365,10 +2365,10 @@ static int32_t app_create_vulkan_instance() { VkApplicationInfo application_info = {}; application_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; application_info.pApplicationName = "app"; - application_info.applicationVersion = VK_MAKE_API_VERSION(0, 1, 0, 0); + application_info.applicationVersion = VK_MAKE_API_VERSION(0, 1, 1, 0); application_info.pEngineName = "app"; - application_info.engineVersion = VK_MAKE_API_VERSION(0, 1, 0, 0); - application_info.apiVersion = VK_API_VERSION_1_0; + application_info.engineVersion = VK_MAKE_API_VERSION(0, 1, 1, 0); + application_info.apiVersion = VK_API_VERSION_1_1; VkInstanceCreateInfo instance_create_info = {}; instance_create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -2615,9 +2615,14 @@ static int32_t app_create_allocator() { vma_vulkan_func.vkCreateImage = vkCreateImage; vma_vulkan_func.vkDestroyImage = vkDestroyImage; vma_vulkan_func.vkCmdCopyBuffer = vkCmdCopyBuffer; + vma_vulkan_func.vkGetBufferMemoryRequirements2KHR = vkGetBufferMemoryRequirements2; + vma_vulkan_func.vkGetImageMemoryRequirements2KHR = vkGetImageMemoryRequirements2; + vma_vulkan_func.vkBindBufferMemory2KHR = vkBindBufferMemory2; + vma_vulkan_func.vkBindImageMemory2KHR = vkBindImageMemory2; + vma_vulkan_func.vkGetPhysicalDeviceMemoryProperties2KHR = vkGetPhysicalDeviceMemoryProperties2; VmaAllocatorCreateInfo create_info = {}; - create_info.vulkanApiVersion = VK_API_VERSION_1_0; + create_info.vulkanApiVersion = VK_API_VERSION_1_1; create_info.physicalDevice = vulkan_physical_device; create_info.device = vulkan_device; create_info.pVulkanFunctions = &vma_vulkan_func;