Fix to use static VkInstance

This commit is contained in:
Wojtek Figat
2025-07-31 12:10:42 +02:00
parent bb8f569c41
commit a53a438c3c

View File

@@ -43,7 +43,7 @@
#endif #endif
GPUDeviceVulkan::OptionalVulkanDeviceExtensions GPUDeviceVulkan::OptionalDeviceExtensions; GPUDeviceVulkan::OptionalVulkanDeviceExtensions GPUDeviceVulkan::OptionalDeviceExtensions;
VkInstance GPUDeviceVulkan::Instance; VkInstance GPUDeviceVulkan::Instance = VK_NULL_HANDLE;
Array<const char*> GPUDeviceVulkan::InstanceExtensions; Array<const char*> GPUDeviceVulkan::InstanceExtensions;
Array<const char*> GPUDeviceVulkan::InstanceLayers; Array<const char*> GPUDeviceVulkan::InstanceLayers;
@@ -52,9 +52,6 @@ bool SupportsDebugUtilsExt = false;
#if VK_EXT_debug_utils #if VK_EXT_debug_utils
VkDebugUtilsMessengerEXT Messenger = VK_NULL_HANDLE; VkDebugUtilsMessengerEXT Messenger = VK_NULL_HANDLE;
#endif #endif
#if PLATFORM_SWITCH
VkInstance SwitchVkInstance = VK_NULL_HANDLE;
#endif
bool SupportsDebugCallbackExt = false; bool SupportsDebugCallbackExt = false;
VkDebugReportCallbackEXT MsgCallback = VK_NULL_HANDLE; VkDebugReportCallbackEXT MsgCallback = VK_NULL_HANDLE;
@@ -1244,9 +1241,7 @@ GPUDevice* GPUDeviceVulkan::Create()
return nullptr; return nullptr;
} }
#if PLATFORM_SWITCH #if !PLATFORM_SWITCH
SwitchVkInstance = Instance;
#else
// Setup bindings // Setup bindings
volkLoadInstance(Instance); volkLoadInstance(Instance);
#endif #endif