From a53a438c3c30c67c50b5c69c4cad9159c5d587e9 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 31 Jul 2025 12:10:42 +0200
Subject: [PATCH] Fix to use static VkInstance

---
 Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp b/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp
index fb7510a2d..2820d5777 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp
+++ b/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp
@@ -43,7 +43,7 @@
 #endif
 
 GPUDeviceVulkan::OptionalVulkanDeviceExtensions GPUDeviceVulkan::OptionalDeviceExtensions;
-VkInstance GPUDeviceVulkan::Instance;
+VkInstance GPUDeviceVulkan::Instance = VK_NULL_HANDLE;
 Array<const char*> GPUDeviceVulkan::InstanceExtensions;
 Array<const char*> GPUDeviceVulkan::InstanceLayers;
 
@@ -52,9 +52,6 @@ bool SupportsDebugUtilsExt = false;
 #if VK_EXT_debug_utils
 VkDebugUtilsMessengerEXT Messenger = VK_NULL_HANDLE;
 #endif
-#if PLATFORM_SWITCH
-VkInstance SwitchVkInstance = VK_NULL_HANDLE;
-#endif
 
 bool SupportsDebugCallbackExt = false;
 VkDebugReportCallbackEXT MsgCallback = VK_NULL_HANDLE;
@@ -1244,9 +1241,7 @@ GPUDevice* GPUDeviceVulkan::Create()
         return nullptr;
     }
 
-#if PLATFORM_SWITCH
-    SwitchVkInstance = Instance;
-#else
+#if !PLATFORM_SWITCH
     // Setup bindings
     volkLoadInstance(Instance);
 #endif