Skip to content

Commit

Permalink
cgpu/git/cmake: update VMA to v3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pablode committed Dec 6, 2024
1 parent fc5e5d1 commit 6527604
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 $<BUILD_INTERFACE:Vulkan-Headers>)
target_link_libraries(VulkanMemoryAllocator INTERFACE $<BUILD_INTERFACE:Vulkan-Headers>)

# SPIRV-Headers (SPIRV-Tools dependency)
set(SPIRV_SKIP_TESTS ON)
Expand Down
2 changes: 1 addition & 1 deletion extern/VulkanMemoryAllocator
4 changes: 2 additions & 2 deletions src/cgpu/impl/Cgpu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1032,8 +1032,8 @@ namespace gtl
}

VmaVulkanFunctions vmaVulkanFunctions = {
.vkGetInstanceProcAddr = nullptr,
.vkGetDeviceProcAddr = nullptr,
.vkGetInstanceProcAddr = vkGetInstanceProcAddr,
.vkGetDeviceProcAddr = vkGetDeviceProcAddr,
.vkGetPhysicalDeviceProperties = vkGetPhysicalDeviceProperties,
.vkGetPhysicalDeviceMemoryProperties = vkGetPhysicalDeviceMemoryProperties,
.vkAllocateMemory = idevice->table.vkAllocateMemory,
Expand Down

0 comments on commit 6527604

Please sign in to comment.