Replace all gflag implementations with cvar implementations

src/xenia/ui/vulkan/vulkan.cc

@@ -9,8 +9,10 @@
 
 #include "xenia/ui/vulkan/vulkan.h"
 
-DEFINE_bool(vulkan_validation, false, "Enable Vulkan validation layers.");
+DEFINE_bool(vulkan_validation, false, "Enable Vulkan validation layers.",
+            "Vulkan");
 
 DEFINE_bool(vulkan_primary_queue_only, false,
             "Force the use of the primary queue, ignoring any additional that "
-            "may be present.");
+            "may be present.",
+            "Vulkan");

src/xenia/ui/vulkan/vulkan.h

@@ -10,8 +10,6 @@
 #ifndef XENIA_UI_VULKAN_VULKAN_H_
 #define XENIA_UI_VULKAN_VULKAN_H_
 
-#include <gflags/gflags.h>
-
 #include "xenia/base/platform.h"
 
 #if XE_PLATFORM_WIN32
@@ -25,6 +23,7 @@
 // We use a loader with its own function prototypes.
 #include "third_party/volk/volk.h"
 #include "third_party/vulkan/vulkan.h"
+#include "xenia/base/cvar.h"
 
 #define XELOGVK XELOGI
 

src/xenia/ui/vulkan/vulkan_device.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/ui/vulkan/vulkan_device.h"
 
-#include <gflags/gflags.h>
-
 #include <cinttypes>
 #include <climits>
 #include <mutex>
@@ -33,7 +31,7 @@ namespace ui {
 namespace vulkan {
 
 VulkanDevice::VulkanDevice(VulkanInstance* instance) : instance_(instance) {
-  if (FLAGS_vulkan_validation) {
+  if (cvars::vulkan_validation) {
     DeclareRequiredLayer("VK_LAYER_LUNARG_standard_validation",
                          Version::Make(0, 0, 0), true);
     // DeclareRequiredLayer("VK_LAYER_GOOGLE_unique_objects", Version::Make(0,
@@ -150,7 +148,7 @@ bool VulkanDevice::Initialize(DeviceInfo device_info) {
   }
 
   // Some tools *cough* renderdoc *cough* can't handle multiple queues.
-  if (FLAGS_vulkan_primary_queue_only) {
+  if (cvars::vulkan_primary_queue_only) {
     queue_count = 1;
   }
 

src/xenia/ui/vulkan/vulkan_instance.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/ui/vulkan/vulkan_instance.h"
 
-#include <gflags/gflags.h>
-
 #include <cinttypes>
 #include <mutex>
 #include <string>
@@ -38,7 +36,7 @@ namespace ui {
 namespace vulkan {
 
 VulkanInstance::VulkanInstance() {
-  if (FLAGS_vulkan_validation) {
+  if (cvars::vulkan_validation) {
     DeclareRequiredLayer("VK_LAYER_LUNARG_standard_validation",
                          Version::Make(0, 0, 0), true);
     // DeclareRequiredLayer("VK_LAYER_GOOGLE_unique_objects", Version::Make(0,

src/xenia/ui/vulkan/vulkan_provider.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/ui/vulkan/vulkan_provider.h"
 
-#include <gflags/gflags.h>
-
 #include <algorithm>
 
 #include "xenia/base/logging.h"
@@ -19,7 +17,8 @@
 #include "xenia/ui/vulkan/vulkan_instance.h"
 #include "xenia/ui/vulkan/vulkan_util.h"
 
-DEFINE_uint64(vulkan_device_index, 0, "Index of the physical device to use.");
+DEFINE_uint64(vulkan_device_index, 0, "Index of the physical device to use.",
+              "Vulkan");
 
 namespace xe {
 namespace ui {
@@ -73,7 +72,7 @@ bool VulkanProvider::Initialize() {
     return false;
   }
   size_t device_index =
-      std::min(available_devices.size(), FLAGS_vulkan_device_index);
+      std::min(available_devices.size(), cvars::vulkan_device_index);
   auto& device_info = available_devices[device_index];
 
   // Create the device.

src/xenia/ui/vulkan/vulkan_swap_chain.cc

@@ -9,12 +9,11 @@
 
 #include "xenia/ui/vulkan/vulkan_swap_chain.h"
 
-#include <gflags/gflags.h>
-
 #include <mutex>
 #include <string>
 
 #include "xenia/base/assert.h"
+#include "xenia/base/cvar.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
 #include "xenia/ui/vulkan/vulkan.h"
@@ -23,7 +22,7 @@
 #include "xenia/ui/vulkan/vulkan_util.h"
 
 DEFINE_bool(vulkan_random_clear_color, false,
-            "Randomizes framebuffer clear color.");
+            "Randomizes framebuffer clear color.", "Vulkan");
 
 namespace xe {
 namespace ui {
@@ -583,7 +582,7 @@ VkResult VulkanSwapChain::Begin() {
   clear_color.float32[1] = 238 / 255.0f;
   clear_color.float32[2] = 238 / 255.0f;
   clear_color.float32[3] = 1.0f;
-  if (FLAGS_vulkan_random_clear_color) {
+  if (cvars::vulkan_random_clear_color) {
     clear_color.float32[0] =
         rand() / static_cast<float>(RAND_MAX);  // NOLINT(runtime/threadsafe_fn)
     clear_color.float32[1] = 1.0f;

src/xenia/ui/vulkan/vulkan_util.h

@@ -12,6 +12,7 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "xenia/ui/vulkan/vulkan.h"