Win32: Improvements to vulkan init error handling

hrydgard · Nov 16, 2017 · 506c4ee · 506c4ee
1 parent 766ddf9
commit 506c4ee
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Windows/GPU/WindowsVulkanContext.cpp b/Windows/GPU/WindowsVulkanContext.cpp
@@ -173,6 +173,12 @@ bool WindowsVulkanContext::Init(HINSTANCE hInst, HWND hWnd, std::string *error_m
 
 	Version gitVer(PPSSPP_GIT_VERSION);
 	g_Vulkan = new VulkanContext();
+	if (g_Vulkan->InitError().size()) {
+		*error_message = g_Vulkan->InitError();
+		delete g_Vulkan;
+		g_Vulkan = nullptr;
+		return false;
+	}
 
 	// int vulkanFlags = VULKAN_FLAG_PRESENT_FIFO_RELAXED;
 	int vulkanFlags = VULKAN_FLAG_PRESENT_MAILBOX;
@@ -181,6 +187,8 @@ bool WindowsVulkanContext::Init(HINSTANCE hInst, HWND hWnd, std::string *error_m
 	}
 	if (VK_SUCCESS != g_Vulkan->CreateInstance("PPSSPP", gitVer.ToInteger(), vulkanFlags)) {
 		*error_message = g_Vulkan->InitError();
+		delete g_Vulkan;
+		g_Vulkan = nullptr;
 		return false;
 	}
 	g_Vulkan->ChooseDevice(g_Vulkan->GetBestPhysicalDevice());
@@ -189,6 +197,8 @@ bool WindowsVulkanContext::Init(HINSTANCE hInst, HWND hWnd, std::string *error_m
 	}
 	if (g_Vulkan->CreateDevice() != VK_SUCCESS) {
 		*error_message = g_Vulkan->InitError();
+		delete g_Vulkan;
+		g_Vulkan = nullptr;
 		return false;
 	}
 	if (g_validate_) {
@@ -197,6 +207,7 @@ bool WindowsVulkanContext::Init(HINSTANCE hInst, HWND hWnd, std::string *error_m
 	}
 	g_Vulkan->InitSurfaceWin32(hInst, hWnd);
 	if (!g_Vulkan->InitObjects()) {
+		*error_message = g_Vulkan->InitError();
 		Shutdown();
 		return false;
 	}