From ba7dc6b2d7187a233d7175c75994828b498bec58 Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Sun, 1 Jul 2018 16:49:36 -0500
Subject: [PATCH] [GPU] Improve readability of initialization errors and remove
 references to OpenGL.

---
 src/xenia/gpu/graphics_system.cc       | 12 ++++++++----
 src/xenia/ui/vulkan/vulkan_provider.cc |  7 +++++--
 src/xenia/ui/vulkan/vulkan_util.cc     |  9 ++++++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/xenia/gpu/graphics_system.cc b/src/xenia/gpu/graphics_system.cc
index 7728e8eee..3a60bc939 100644
--- a/src/xenia/gpu/graphics_system.cc
+++ b/src/xenia/gpu/graphics_system.cc
@@ -68,10 +68,14 @@ X_STATUS GraphicsSystem::Setup(cpu::Processor* processor,
 
     if (!processor_context) {
       xe::FatalError(
-          "Unable to initialize graphics context. Xenia requires OpenGL 4.5 or "
-          "Vulkan support. Ensure you have the latest drivers for your GPU and "
-          "that it supports OpenGL or Vulkan. See http://xenia.jp/faq/ for "
-          "more information.");
+          "Unable to initialize graphics context. Xenia requires Vulkan "
+          "support.\n"
+          "\n"
+          "Ensure you have the latest drivers for your GPU and "
+          "that it supports Vulkan.\n"
+          "\n"
+          "See http://xenia.jp/faq/ for more information and a list of "
+          "supported GPUs.");
       return X_STATUS_UNSUCCESSFUL;
     }
   }
diff --git a/src/xenia/ui/vulkan/vulkan_provider.cc b/src/xenia/ui/vulkan/vulkan_provider.cc
index 0960557ef..5c979f5a1 100644
--- a/src/xenia/ui/vulkan/vulkan_provider.cc
+++ b/src/xenia/ui/vulkan/vulkan_provider.cc
@@ -30,9 +30,12 @@ std::unique_ptr<VulkanProvider> VulkanProvider::Create(Window* main_window) {
   if (!provider->Initialize()) {
     xe::FatalError(
         "Unable to initialize Vulkan graphics subsystem.\n"
+        "\n"
         "Ensure you have the latest drivers for your GPU and that it "
-        "supports Vulkan. See http://xenia.jp/faq/ for more information and a "
-        "list of supported GPUs.");
+        "supports Vulkan.\n"
+        "\n"
+        "See http://xenia.jp/faq/ for more information and a list of supported "
+        "GPUs.");
     return nullptr;
   }
   return provider;
diff --git a/src/xenia/ui/vulkan/vulkan_util.cc b/src/xenia/ui/vulkan/vulkan_util.cc
index 2e2034f65..04cae1c24 100644
--- a/src/xenia/ui/vulkan/vulkan_util.cc
+++ b/src/xenia/ui/vulkan/vulkan_util.cc
@@ -399,9 +399,12 @@ const char* to_string(VkPresentModeKHR present_mode) {
 void FatalVulkanError(std::string error) {
   xe::FatalError(
       error +
-      "\nEnsure you have the latest drivers for your GPU and that it supports "
-      "Vulkan. See http://xenia.jp/faq/ for more information and a list"
-      "of supported GPUs.");
+      "\n\n"
+      "Ensure you have the latest drivers for your GPU and that it supports "
+      "Vulkan.\n"
+      "\n"
+      "See http://xenia.jp/faq/ for more information and a list of supported "
+      "GPUs.");
 }
 
 void CheckResult(VkResult result, const char* action) {