1 files changed, 4 insertions, 8 deletions
diff --git a/deimos/vulkan/vulkan_loader.cpp b/deimos/vulkan/vulkan_loader.cpp
index b9980af..c4d7d87 100644
--- a/deimos/vulkan/vulkan_loader.cpp
+++ b/deimos/vulkan/vulkan_loader.cpp
@@ -1,4 +1,4 @@
-#include "deimos/vulkan/vulkan.h"
+#include "deimos/vulkan/vulkan_loader.h"
 
 #include <deimos/core/api_registry.h>
 #include <deimos/core/allocator.h>
@@ -13,13 +13,10 @@ namespace deimos
 
 class VulkanLoaderImpl : public VulkanLoaderApi
 {
-    Allocator*            m_allocator;
     gsl::owner<OsDll*>    m_vulkan_dll{};
     
 public:
-    explicit VulkanLoaderImpl(Allocator* allocator) : m_allocator{allocator} {}
-    
-    VulkanApi* LoadEntry() override
+    VulkanApi* LoadEntry(Allocator* allocator) override
     {
         if (m_vulkan_dll == nullptr)
         {
@@ -34,7 +31,7 @@ public:
             }
         }
 
-        VulkanApi* api = m_allocator->New<VulkanApi>();
+        VulkanApi* api = allocator->New<VulkanApi>();
         
 #define FN(NAME) api->NAME = (PFN_vk##NAME)os_api->dll->GetSymbol(m_vulkan_dll, "vk" #NAME);
 #include "deimos/vulkan/vulkan_bootstrap_functions.inc"
@@ -76,9 +73,8 @@ void RegisterVulkanLoaderApi(ApiRegistry* registry)
     log_api = registry->Get<LogApi>();
 
     auto* allocator_api = registry->Get<AllocatorApi>();
-    auto* allocator = allocator_api->CreateChild(allocator_api->system, "Vulkan");
 
-    auto* impl = allocator->New<VulkanLoaderImpl>(allocator);
+    auto* impl = allocator_api->system->New<VulkanLoaderImpl>();
     registry->Set(impl);
     
     log_api->LogInfo("Vulkan loader API registered");