diff options
| author | Shannon McPherson <shannon@lunarg.com> | 2017-10-30 16:36:40 -0600 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2018-03-09 13:54:31 -0700 |
| commit | 7c535e08c7edeeefac3ef8555dfdf73f01417366 (patch) | |
| tree | b2df2e61251163d7bf9e92a28cc9e3db1c56d5ad | |
| parent | 44ab4c9a317174fb3bdc9a9039413db0f306a5e7 (diff) | |
| download | usermoji-7c535e08c7edeeefac3ef8555dfdf73f01417366.tar.xz | |
demos: Update Vulkan Instance Version reporting
| -rw-r--r-- | demos/vulkaninfo.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index 59d6d192..1d6ab62e 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -2912,9 +2912,20 @@ int main(int argc, char **argv) { #ifdef _WIN32 if (ConsoleIsExclusive()) ConsoleEnlarge(); #endif + PFN_vkEnumerateInstanceVersion enumerate_instance_version = + (PFN_vkEnumerateInstanceVersion)vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); - for (int i = 1; i < argc; ++i) { - // Check for html option + uint32_t instance_version = VK_API_VERSION_1_0; + + if (enumerate_instance_version != NULL) { + enumerate_instance_version(&instance_version); + } + + const uint32_t vulkan_major = VK_VERSION_MAJOR(instance_version); + const uint32_t vulkan_minor = VK_VERSION_MINOR(instance_version); + const uint32_t vulkan_patch = VK_VERSION_PATCH(VK_HEADER_VERSION); + + for (int i = 1; i < argc; i++) { if (strcmp(argv[i], "--html") == 0) { out = fopen("vulkaninfo.html", "w"); human_readable_output = false; @@ -2924,10 +2935,6 @@ int main(int argc, char **argv) { CheckForJsonOption(argv[i]); } - const uint32_t vulkan_major = VK_VERSION_MAJOR(VK_API_VERSION_1_0); - const uint32_t vulkan_minor = VK_VERSION_MINOR(VK_API_VERSION_1_0); - const uint32_t vulkan_patch = VK_VERSION_PATCH(VK_HEADER_VERSION); - if (html_output) { PrintHtmlHeader(out); fprintf(out, "\t\t\t<details><summary>"); @@ -2937,7 +2944,7 @@ int main(int argc, char **argv) { printf("===========\n\n"); } if (html_output || human_readable_output) { - fprintf(out, "Vulkan API Version: "); + fprintf(out, "Vulkan Instance Version: "); } if (html_output) { fprintf(out, "<div class='val'>%d.%d.%d</div></summary></details>\n", vulkan_major, vulkan_minor, vulkan_patch); |