1 files changed, 9 insertions, 13 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 80e94aa..9fb4755 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1,9 +1,7 @@
-#include "vulkan_core.h"
 #include <deimos/core/api_registry.h>
 #include <deimos/core/log.h>
-#include <deimos/core/os.h>
 #include <deimos/core/temp_allocator.h>
-#include <vulkan.h>
+#include <deimos/vulkan/vulkan.h>
 
 using namespace deimos;
 
@@ -11,17 +9,15 @@ int main(int /* argc */, char* /* argv */[])
 {
     auto* api_registry = InitializeGlobalApiRegistry();
     auto* log_api = api_registry->Get<LogApi>();
-    auto* os_api = api_registry->Get<OsApi>();
+    log_api->LogInfo("Base APIs registered");
+
+    RegisterVulkanLoaderApi(api_registry);
+    auto* vulkan_loader_api = api_registry->Get<VulkanLoaderApi>();
+    auto* vk = vulkan_loader_api->LoadEntry();
 
-    log_api->LogInfo("Hello");
-
-    auto* vulkan_dll = os_api->dll->Open("vulkan-1.dll");
-    Ensures(vulkan_dll != nullptr);
-    log_api->LogInfo("Vulkan DLL loaded");
-
-    auto vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)os_api->dll->GetSymbol(vulkan_dll, "vkGetInstanceProcAddr");
-    Ensures(vkGetInstanceProcAddr != nullptr);
-    log_api->LogInfo("vkGetInstanceProcAddr found");
+    Ensures(vk->GetInstanceProcAddr != nullptr);
+    Ensures(vk->CreateInstance != nullptr);
+    log_api->LogInfo("OK");
 
     return 0;
 }