From 8c18d3ce8e52c2ca9b0894ab8e68724895fa44a9 Mon Sep 17 00:00:00 2001
From: Sasha Szpakowski <slime73@gmail.com>
Date: Sun, 19 Jul 2026 10:39:55 -0300
Subject: [PATCH] vulkan: slightly more robust initialization

---
 src/modules/graphics/vulkan/Graphics.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/modules/graphics/vulkan/Graphics.cpp b/src/modules/graphics/vulkan/Graphics.cpp
index 1d25acc69..92f8eb0c0 100644
--- a/src/modules/graphics/vulkan/Graphics.cpp
+++ b/src/modules/graphics/vulkan/Graphics.cpp
@@ -122,13 +122,25 @@ Graphics::Graphics()
 		throw love::Exception("Could not initialize SDL video subsystem (%s)", SDL_GetError());
 
 	if (!SDL_Vulkan_LoadLibrary(nullptr))
+	{
+		SDL_QuitSubSystem(SDL_INIT_VIDEO);
 		throw love::Exception("could not find vulkan");
+	}
 
-	volkInitializeCustom((PFN_vkGetInstanceProcAddr)SDL_Vulkan_GetVkGetInstanceProcAddr());
+	PFN_vkGetInstanceProcAddr handler = (PFN_vkGetInstanceProcAddr)SDL_Vulkan_GetVkGetInstanceProcAddr();
+	if (handler == nullptr)
+	{
+		SDL_Vulkan_UnloadLibrary();
+		SDL_QuitSubSystem(SDL_INIT_VIDEO);
+		throw love::Exception("Could not find Vulkan function loader");
+	}
+
+	volkInitializeCustom(handler);
 
 	if (isDebugEnabled() && !checkValidationSupport())
 	{
 		SDL_Vulkan_UnloadLibrary();
+		SDL_QuitSubSystem(SDL_INIT_VIDEO);
 		throw love::Exception("validation layers requested, but not available");
 	}
 
@@ -152,7 +164,8 @@ Graphics::Graphics()
 	if (extensions_string == nullptr)
 	{
 		SDL_Vulkan_UnloadLibrary();
-		throw love::Exception("couldn't retrieve sdl vulkan extensions");
+		SDL_QuitSubSystem(SDL_INIT_VIDEO);
+		throw love::Exception("couldn't retrieve SDL Vulkan extensions");
 	}
 
 	std::vector<const char*> extensions(extensions_string, extensions_string + count);
@@ -179,6 +192,7 @@ Graphics::Graphics()
 	if (result != VK_SUCCESS)
 	{
 		SDL_Vulkan_UnloadLibrary();
+		SDL_QuitSubSystem(SDL_INIT_VIDEO);
 		throw love::Exception("couldn't create vulkan instance: %s", Vulkan::getErrorString(result));
 	}
 
@@ -207,6 +221,7 @@ Graphics::Graphics()
 	{
 		vkDestroyInstance(instance, nullptr);
 		SDL_Vulkan_UnloadLibrary();
+		SDL_QuitSubSystem(SDL_INIT_VIDEO);
 		throw love::Exception("no suitable vulkan physical devices found");
 	}
 }
@@ -1698,8 +1713,8 @@ void Graphics::pickPhysicalDevice()
 // if the score is 0 the device is unsuitable
 int Graphics::rateDeviceSuitability(VkPhysicalDevice device, bool querySwapChain)
 {
-	VkPhysicalDeviceProperties deviceProperties;
-	VkPhysicalDeviceFeatures deviceFeatures;
+	VkPhysicalDeviceProperties deviceProperties = {};
+	VkPhysicalDeviceFeatures deviceFeatures = {};
 	vkGetPhysicalDeviceProperties(device, &deviceProperties);
 	vkGetPhysicalDeviceFeatures(device, &deviceFeatures);