From 6527604479c13ff975f53d09ded5b196ba0a84e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Delgado=20Kr=C3=A4mer?= Date: Thu, 5 Dec 2024 23:30:23 +0100 Subject: [PATCH] cgpu/git/cmake: update VMA to v3.1.0 --- extern/CMakeLists.txt | 2 +- extern/VulkanMemoryAllocator | 2 +- src/cgpu/impl/Cgpu.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 4f95219c..f16f269f 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -57,7 +57,7 @@ target_link_libraries(volk PUBLIC Vulkan-Headers) set(VMA_STATIC_VULKAN_FUNCTIONS OFF) set(VMA_DYNAMIC_VULKAN_FUNCTIONS OFF) add_subdirectory(VulkanMemoryAllocator) -target_link_libraries(VulkanMemoryAllocator PUBLIC $) +target_link_libraries(VulkanMemoryAllocator INTERFACE $) # SPIRV-Headers (SPIRV-Tools dependency) set(SPIRV_SKIP_TESTS ON) diff --git a/extern/VulkanMemoryAllocator b/extern/VulkanMemoryAllocator index 0e89587d..009ecd19 160000 --- a/extern/VulkanMemoryAllocator +++ b/extern/VulkanMemoryAllocator @@ -1 +1 @@ -Subproject commit 0e89587db3ebee4d463f191bd296374c5fafc8ea +Subproject commit 009ecd192c1289c7529bff248a16cfe896254816 diff --git a/src/cgpu/impl/Cgpu.cpp b/src/cgpu/impl/Cgpu.cpp index 35f79d41..282954a4 100644 --- a/src/cgpu/impl/Cgpu.cpp +++ b/src/cgpu/impl/Cgpu.cpp @@ -1032,8 +1032,8 @@ namespace gtl } VmaVulkanFunctions vmaVulkanFunctions = { - .vkGetInstanceProcAddr = nullptr, - .vkGetDeviceProcAddr = nullptr, + .vkGetInstanceProcAddr = vkGetInstanceProcAddr, + .vkGetDeviceProcAddr = vkGetDeviceProcAddr, .vkGetPhysicalDeviceProperties = vkGetPhysicalDeviceProperties, .vkGetPhysicalDeviceMemoryProperties = vkGetPhysicalDeviceMemoryProperties, .vkAllocateMemory = idevice->table.vkAllocateMemory,