From c6efc0dbc41bd2632076a88a86b9da9f205c8d73 Mon Sep 17 00:00:00 2001
From: Lava Block <the@lava-block.com>
Date: Sat, 9 Jan 2021 03:03:07 +0100
Subject: [PATCH] add vma_flags to device::create_param
---
liblava/base/device.cpp | 7 +++--
liblava/base/device.hpp | 1 +
liblava/base/memory.cpp | 58 ++++++++++++++++++++---------------------
liblava/base/memory.hpp | 27 ++++++++++++++-----
4 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/liblava/base/device.cpp b/liblava/base/device.cpp
index 55b2547d..6d7b2d69 100644
--- a/liblava/base/device.cpp
+++ b/liblava/base/device.cpp
@@ -150,7 +150,10 @@ namespace lava {
transfer_queue_list.clear();
queue_list.clear();
- mem_allocator = nullptr;
+ if (mem_allocator) {
+ mem_allocator->destroy();
+ mem_allocator = nullptr;
+ }
call().vkDestroyDevice(vk_device, memory::alloc());
vk_device = nullptr;
@@ -206,7 +209,7 @@ namespace lava {
if (!result->create(param))
return nullptr;
- auto allocator = make_allocator(result->get_vk_physical_device(), result->get());
+ auto allocator = create_allocator(result.get(), param.vma_flags);
if (!allocator)
return nullptr;
diff --git a/liblava/base/device.hpp b/liblava/base/device.hpp
index 25005fb5..50220af0 100644
--- a/liblava/base/device.hpp
+++ b/liblava/base/device.hpp
@@ -22,6 +22,7 @@ namespace lava {
using ref = create_param const&;
physical_device_cptr physical_device = nullptr;
+ VmaAllocatorCreateFlags vma_flags = 0;
names extensions;
VkPhysicalDeviceFeatures features{};
diff --git a/liblava/base/memory.cpp b/liblava/base/memory.cpp
index 8dc62ac1..2ee2d2d4 100644
--- a/liblava/base/memory.cpp
+++ b/liblava/base/memory.cpp
@@ -2,6 +2,7 @@
// copyright : Copyright (c) 2018-present, Lava Block OÜ and contributors
// license : MIT; see accompanying LICENSE file
+#include <liblava/base/device.hpp>
#include <liblava/base/instance.hpp>
#include <liblava/base/memory.hpp>
@@ -83,54 +84,51 @@ namespace lava {
return no_type;
}
- allocator::allocator(VkPhysicalDevice physical_device, VkDevice device) {
- VmaVulkanFunctions vulkan_function {
+ bool allocator::create(device_cptr device, VmaAllocatorCreateFlags flags) {
+ VmaVulkanFunctions const vulkan_function {
.vkGetPhysicalDeviceProperties = vkGetPhysicalDeviceProperties,
.vkGetPhysicalDeviceMemoryProperties = vkGetPhysicalDeviceMemoryProperties,
- .vkAllocateMemory = vkAllocateMemory,
- .vkFreeMemory = vkFreeMemory,
- .vkMapMemory = vkMapMemory,
- .vkUnmapMemory = vkUnmapMemory,
- .vkFlushMappedMemoryRanges = vkFlushMappedMemoryRanges,
- .vkInvalidateMappedMemoryRanges = vkInvalidateMappedMemoryRanges,
- .vkBindBufferMemory = vkBindBufferMemory,
- .vkBindImageMemory = vkBindImageMemory,
- .vkGetBufferMemoryRequirements = vkGetBufferMemoryRequirements,
- .vkGetImageMemoryRequirements = vkGetImageMemoryRequirements,
- .vkCreateBuffer = vkCreateBuffer,
- .vkDestroyBuffer = vkDestroyBuffer,
- .vkCreateImage = vkCreateImage,
- .vkDestroyImage = vkDestroyImage,
- .vkCmdCopyBuffer = vkCmdCopyBuffer,
+ .vkAllocateMemory = device->call().vkAllocateMemory,
+ .vkFreeMemory = device->call().vkFreeMemory,
+ .vkMapMemory = device->call().vkMapMemory,
+ .vkUnmapMemory = device->call().vkUnmapMemory,
+ .vkFlushMappedMemoryRanges = device->call().vkFlushMappedMemoryRanges,
+ .vkInvalidateMappedMemoryRanges = device->call().vkInvalidateMappedMemoryRanges,
+ .vkBindBufferMemory = device->call().vkBindBufferMemory,
+ .vkBindImageMemory = device->call().vkBindImageMemory,
+ .vkGetBufferMemoryRequirements = device->call().vkGetBufferMemoryRequirements,
+ .vkGetImageMemoryRequirements = device->call().vkGetImageMemoryRequirements,
+ .vkCreateBuffer = device->call().vkCreateBuffer,
+ .vkDestroyBuffer = device->call().vkDestroyBuffer,
+ .vkCreateImage = device->call().vkCreateImage,
+ .vkDestroyImage = device->call().vkDestroyImage,
+ .vkCmdCopyBuffer = device->call().vkCmdCopyBuffer,
#if VMA_DEDICATED_ALLOCATION
- .vkGetBufferMemoryRequirements2KHR = vkGetBufferMemoryRequirements2KHR,
- .vkGetImageMemoryRequirements2KHR = vkGetImageMemoryRequirements2KHR,
+ .vkGetBufferMemoryRequirements2KHR = device->call().vkGetBufferMemoryRequirements2KHR,
+ .vkGetImageMemoryRequirements2KHR = device->call().vkGetImageMemoryRequirements2KHR,
#endif
#if VMA_BIND_MEMORY2
- .vkBindBufferMemory2KHR = vkBindBufferMemory2KHR,
- .vkBindImageMemory2KHR = vkBindImageMemory2KHR,
+ .vkBindBufferMemory2KHR = device->call().vkBindBufferMemory2KHR,
+ .vkBindImageMemory2KHR = device->call().vkBindImageMemory2KHR,
#endif
#if VMA_MEMORY_BUDGET
.vkGetPhysicalDeviceMemoryProperties2KHR = vkGetPhysicalDeviceMemoryProperties2KHR
#endif
};
- VmaAllocatorCreateInfo allocator_info{
- .physicalDevice = physical_device,
- .device = device,
+ VmaAllocatorCreateInfo const allocator_info{
+ .flags = flags,
+ .physicalDevice = device->get_vk_physical_device(),
+ .device = device->get(),
.pAllocationCallbacks = memory::alloc(),
.pVulkanFunctions = &vulkan_function,
.instance = instance::get(),
};
- check(vmaCreateAllocator(&allocator_info, &vma_allocator));
+ return check(vmaCreateAllocator(&allocator_info, &vma_allocator));
}
- allocator::allocator(VmaAllocator allocator) {
- vma_allocator = allocator;
- }
-
- allocator::~allocator() {
+ void allocator::destroy() {
if (!vma_allocator)
return;
diff --git a/liblava/base/memory.hpp b/liblava/base/memory.hpp
index 77cbf03e..fc2caaf4 100644
--- a/liblava/base/memory.hpp
+++ b/liblava/base/memory.hpp
@@ -13,13 +13,20 @@
namespace lava {
- struct allocator {
- explicit allocator(VkPhysicalDevice physical_device, VkDevice device);
- explicit allocator(VmaAllocator allocator);
- ~allocator();
+ // fwd
+ struct device;
+ using device_cptr = device const*;
+ struct allocator {
using ptr = std::shared_ptr<allocator>;
+ allocator() = default;
+ explicit allocator(VmaAllocator allocator)
+ : vma_allocator(allocator) {}
+
+ bool create(device_cptr device, VmaAllocatorCreateFlags flags = 0);
+ void destroy();
+
bool valid() const {
return vma_allocator != nullptr;
}
@@ -32,8 +39,16 @@ namespace lava {
VmaAllocator vma_allocator = nullptr;
};
- inline allocator::ptr make_allocator(VkPhysicalDevice physical_device, VkDevice device) {
- return std::make_shared<allocator>(physical_device, device);
+ inline allocator::ptr make_allocator() {
+ return std::make_shared<allocator>();
+ }
+
+ inline allocator::ptr create_allocator(device_cptr device, VmaAllocatorCreateFlags flags = 0) {
+ auto result = make_allocator();
+ if (!result->create(device, flags))
+ return nullptr;
+
+ return result;
}
struct memory : no_copy_no_move {
--
GitLab