From 8a53ceb83edae4c81181190381cc93ad829e4670 Mon Sep 17 00:00:00 2001
From: Lucas Alber <lucasd.alber@gmail.com>
Date: Mon, 4 Nov 2024 19:00:23 +0100
Subject: [PATCH] merian: fix casing on NULL_MEMEMORY_ALLOCATION_HANDLE

---
 include/merian/vk/memory/buffer_suballocator.hpp | 2 +-
 include/merian/vk/memory/memory_allocator.hpp    | 2 +-
 src/merian/vk/memory/buffer_suballocator.cpp     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/merian/vk/memory/buffer_suballocator.hpp b/include/merian/vk/memory/buffer_suballocator.hpp
index b23aeef0..1da00de2 100644
--- 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
index 4e6b2781..a1c3b292 100644
--- 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
index 520713c2..3227a162 100644
--- 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;