aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard S. Wright Jr <richard@lunarg.com>2020-11-19 16:24:25 -0500
committerRichard S. Wright Jr <58573781+richard-lunarg@users.noreply.github.com>2020-11-23 14:24:26 -0500
commita9e415eea355a01d32eb8dca083b80976b04f24e (patch)
tree9f3c7439209b03e39e7520e37a3b319d01730768
parent06cfa7a1dd3b59df0d657b042abdf96abbaa5dc3 (diff)
downloadusermoji-a9e415eea355a01d32eb8dca083b80976b04f24e.tar.xz
vulkaninfo: Fix to pass appveyor tests
-rw-r--r--vulkaninfo/vulkaninfo.cpp9
-rw-r--r--vulkaninfo/vulkaninfo.h8
2 files changed, 9 insertions, 8 deletions
diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp
index bc2c155e..9a813688 100644
--- a/vulkaninfo/vulkaninfo.cpp
+++ b/vulkaninfo/vulkaninfo.cpp
@@ -865,14 +865,7 @@ int main(int argc, char **argv) {
// On iOS, we'll call this ourselves from a parent routine in the GUI
int vulkanInfoMain(int argc, char **argv) {
#endif
-
- bool human_readable_output = true;
- bool html_output = false;
- bool json_output = false;
- bool vkconfig_output = false;
- bool portability_json = false;
- bool summary = false;
-
+
#ifdef _WIN32
if (ConsoleIsExclusive()) ConsoleEnlarge();
if (!LoadUser32Dll()) {
diff --git a/vulkaninfo/vulkaninfo.h b/vulkaninfo/vulkaninfo.h
index 0fe36e44..ce7b2123 100644
--- a/vulkaninfo/vulkaninfo.h
+++ b/vulkaninfo/vulkaninfo.h
@@ -108,6 +108,14 @@ struct VulkanException : std::runtime_error {
};
#define THROW_VK_ERR(func_name, err) throw VulkanException(func_name, __FILE__, __LINE__, err);
+bool human_readable_output = true;
+bool html_output = false;
+bool json_output = false;
+bool vkconfig_output = false;
+bool portability_json = false;
+bool summary = false;
+
+
#ifdef _WIN32
#define strdup _strdup