From 9afdbeb6c2bdc56b02779a7cd51da2311db03891 Mon Sep 17 00:00:00 2001
From: "Richard S. Wright Jr" <richard@lunarg.com>
Date: Thu, 19 Nov 2020 21:38:50 -0500
Subject: [PATCH] vulkaninfo: cleanup and comments

---
 vulkaninfo/vulkaninfo.cpp | 24 ++++++++++++------------
 vulkaninfo/vulkaninfo.h   |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp
index 9a81368..5178318 100644
--- a/vulkaninfo/vulkaninfo.cpp
+++ b/vulkaninfo/vulkaninfo.cpp
@@ -859,11 +859,11 @@ void print_usage(const char *argv0) {
     std::cout << "--summary           Show a summary of the instance and GPU's on a system.\n\n";
 }
 
-#ifndef VK_USE_PLATFORM_IOS_MVK
-int main(int argc, char **argv) {
-#else
+#ifdef VK_USE_PLATFORM_IOS_MVK
 // On iOS, we'll call this ourselves from a parent routine in the GUI
 int vulkanInfoMain(int argc, char **argv) {
+#else
+int main(int argc, char **argv) {
 #endif
         
 #ifdef _WIN32
@@ -979,13 +979,13 @@ int vulkanInfoMain(int argc, char **argv) {
                 "\t\"comments\": {\n\t\t\"desc\": \"JSON configuration file describing GPU " + std::to_string(selected_gpu) +
                 ". Generated using the vulkaninfo program.\",\n\t\t\"vulkanApiVersion\": \"" +
                 VkVersionString(instance.vk_version) + "\"\n" + "\t}";
-#ifndef VK_USE_PLATFORM_IOS_MVK
-            printers.push_back(
-                std::unique_ptr<Printer>(new Printer(OutputType::json, out, selected_gpu, instance.vk_version, start_string)));
-#else
+#ifdef VK_USE_PLATFORM_IOS_MVK
             json_out = std::ofstream("vulkaninfo.json");
             printers.push_back(
                 std::unique_ptr<Printer>(new Printer(OutputType::json, json_out, selected_gpu, instance.vk_version, start_string)));
+#else
+            printers.push_back(
+                std::unique_ptr<Printer>(new Printer(OutputType::json, out, selected_gpu, instance.vk_version, start_string)));
 #endif
         }
 #if defined(VK_ENABLE_BETA_EXTENSIONS)
@@ -1002,13 +1002,13 @@ int vulkanInfoMain(int argc, char **argv) {
                     "'s portability features and properties. Generated using the vulkaninfo program.\",\n\t\t\"vulkanApiVersion\": "
                     "\"" +
                     VkVersionString(instance.vk_version) + "\"\n" + "\t}";
-#ifndef VK_USE_PLATFORM_IOS_MVK
+#ifdef VK_USE_PLATFORM_IOS_MVK
+                portability_out = std::ofstream("portability.json");
                 printers.push_back(
-                    std::unique_ptr<Printer>(new Printer(OutputType::json, out, selected_gpu, instance.vk_version, start_string)));
+                    std::unique_ptr<Printer>(new Printer(OutputType::json, portability_out, selected_gpu, instance.vk_version, start_string)));
 #else
-                portability_out = std::ofstream("portabiliyt.json");
                 printers.push_back(
-                    std::unique_ptr<Printer>(new Printer(OutputType::json, portability_out, selected_gpu, instance.vk_version, start_string)));
+                    std::unique_ptr<Printer>(new Printer(OutputType::json, out, selected_gpu, instance.vk_version, start_string)));
 #endif
             }
         }
@@ -1025,7 +1025,7 @@ int vulkanInfoMain(int argc, char **argv) {
         }
 
         for (auto &p : printers) {
-#if defined(VK_USE_PLATFORM_IOS_MVK)
+#ifdef VK_USE_PLATFORM_IOS_MVK
             p->SetAlwaysOpenDetails(true);
 #endif
             if (summary) {
diff --git a/vulkaninfo/vulkaninfo.h b/vulkaninfo/vulkaninfo.h
index ce7b212..1387c56 100644
--- a/vulkaninfo/vulkaninfo.h
+++ b/vulkaninfo/vulkaninfo.h
@@ -108,6 +108,7 @@ struct VulkanException : std::runtime_error {
 };
 #define THROW_VK_ERR(func_name, err) throw VulkanException(func_name, __FILE__, __LINE__, err);
 
+// Global configuration (Used by Windows WAIT_FOR_CONSOLE_DESTROY MACRO)
 bool human_readable_output = true;
 bool html_output = false;
 bool json_output = false;
-- 
2.7.4