merian: fix casing on NULL_MEMEMORY_ALLOCATION_HANDLE

LDAP · Nov 4, 2024 · 8a53ceb · 8a53ceb
1 parent 2644dc8
commit 8a53ceb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/include/merian/vk/memory/buffer_suballocator.hpp b/include/merian/vk/memory/buffer_suballocator.hpp
@@ -254,7 +254,7 @@ class BufferSubAllocator {
         vk::DeviceSize size = 0;
         vk::Buffer buffer = VK_NULL_HANDLE;
         TRangeAllocator<BASE_ALIGNMENT> range;
-        MemoryAllocationHandle memory = NullMememoryAllocationHandle;
+        MemoryAllocationHandle memory = NULL_MEMEMORY_ALLOCATION_HANDLE;
         uint8_t* mapping = nullptr;
         vk::DeviceAddress address = 0;
         bool isDedicated = false;

diff --git a/include/merian/vk/memory/memory_allocator.hpp b/include/merian/vk/memory/memory_allocator.hpp
@@ -18,7 +18,7 @@ using MemoryAllocationHandle = std::shared_ptr<MemoryAllocation>;
 class MemoryAllocator;
 using MemoryAllocatorHandle = std::shared_ptr<MemoryAllocator>;
 
-static const MemoryAllocationHandle NullMememoryAllocationHandle = nullptr;
+static const MemoryAllocationHandle NULL_MEMEMORY_ALLOCATION_HANDLE = nullptr;
 
 enum class MemoryMappingType {
     // Memory mapping is not possible. GPU-only resources.

diff --git a/src/merian/vk/memory/buffer_suballocator.cpp b/src/merian/vk/memory/buffer_suballocator.cpp
@@ -178,7 +178,7 @@ void BufferSubAllocator::freeBlock(Block& block) {
     if (!block.isDedicated) {
         block.range.deinit();
     }
-    block.memory = NullMememoryAllocationHandle;
+    block.memory = NULL_MEMEMORY_ALLOCATION_HANDLE;
     block.buffer = VK_NULL_HANDLE;
     block.mapping = nullptr;
     block.isDedicated = false;