summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_vulkan/vk_memory_manager.cpp
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-01-03 22:11:01 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2021-01-15 20:19:39 +0100
commitc2b550987b2eed4ead610222d6912868480c85f2 (patch)
treefeddfc67e7fcad0affee0c3522795c8b8df34776 /src/video_core/renderer_vulkan/vk_memory_manager.cpp
parentvk_memory_manager: Improve memory manager and its API (diff)
downloadyuzu-c2b550987b2eed4ead610222d6912868480c85f2.tar
yuzu-c2b550987b2eed4ead610222d6912868480c85f2.tar.gz
yuzu-c2b550987b2eed4ead610222d6912868480c85f2.tar.bz2
yuzu-c2b550987b2eed4ead610222d6912868480c85f2.tar.lz
yuzu-c2b550987b2eed4ead610222d6912868480c85f2.tar.xz
yuzu-c2b550987b2eed4ead610222d6912868480c85f2.tar.zst
yuzu-c2b550987b2eed4ead610222d6912868480c85f2.zip
Diffstat (limited to 'src/video_core/renderer_vulkan/vk_memory_manager.cpp')
-rw-r--r--src/video_core/renderer_vulkan/vk_memory_manager.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/video_core/renderer_vulkan/vk_memory_manager.cpp b/src/video_core/renderer_vulkan/vk_memory_manager.cpp
index 102987240..cabf0b6ca 100644
--- a/src/video_core/renderer_vulkan/vk_memory_manager.cpp
+++ b/src/video_core/renderer_vulkan/vk_memory_manager.cpp
@@ -151,12 +151,12 @@ void MemoryCommit::Release() {
}
}
-VKMemoryManager::VKMemoryManager(const Device& device_)
+MemoryAllocator::MemoryAllocator(const Device& device_)
: device{device_}, properties{device_.GetPhysical().GetMemoryProperties()} {}
-VKMemoryManager::~VKMemoryManager() = default;
+MemoryAllocator::~MemoryAllocator() = default;
-MemoryCommit VKMemoryManager::Commit(const VkMemoryRequirements& requirements, bool host_visible) {
+MemoryCommit MemoryAllocator::Commit(const VkMemoryRequirements& requirements, bool host_visible) {
const u64 chunk_size = GetAllocationChunkSize(requirements.size);
// When a host visible commit is asked, search for host visible and coherent, otherwise search
@@ -176,19 +176,19 @@ MemoryCommit VKMemoryManager::Commit(const VkMemoryRequirements& requirements, b
return TryAllocCommit(requirements, wanted_properties).value();
}
-MemoryCommit VKMemoryManager::Commit(const vk::Buffer& buffer, bool host_visible) {
+MemoryCommit MemoryAllocator::Commit(const vk::Buffer& buffer, bool host_visible) {
auto commit = Commit(device.GetLogical().GetBufferMemoryRequirements(*buffer), host_visible);
buffer.BindMemory(commit.Memory(), commit.Offset());
return commit;
}
-MemoryCommit VKMemoryManager::Commit(const vk::Image& image, bool host_visible) {
+MemoryCommit MemoryAllocator::Commit(const vk::Image& image, bool host_visible) {
auto commit = Commit(device.GetLogical().GetImageMemoryRequirements(*image), host_visible);
image.BindMemory(commit.Memory(), commit.Offset());
return commit;
}
-void VKMemoryManager::AllocMemory(VkMemoryPropertyFlags wanted_properties, u32 type_mask,
+void MemoryAllocator::AllocMemory(VkMemoryPropertyFlags wanted_properties, u32 type_mask,
u64 size) {
const u32 type = [&] {
for (u32 type_index = 0; type_index < properties.memoryTypeCount; ++type_index) {
@@ -211,7 +211,7 @@ void VKMemoryManager::AllocMemory(VkMemoryPropertyFlags wanted_properties, u32 t
wanted_properties, size, type));
}
-std::optional<MemoryCommit> VKMemoryManager::TryAllocCommit(
+std::optional<MemoryCommit> MemoryAllocator::TryAllocCommit(
const VkMemoryRequirements& requirements, VkMemoryPropertyFlags wanted_properties) {
for (auto& allocation : allocations) {
if (!allocation->IsCompatible(wanted_properties, requirements.memoryTypeBits)) {