diff options
| author | Petr Kraus <petr_kraus@email.cz> | 2017-12-13 22:24:15 +0100 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2017-12-19 17:43:24 -0700 |
| commit | 58db2d7cc94023ae63d4c1c98eb5df74c0b62f0d (patch) | |
| tree | 11f92fba5b5759fc0a1b7a6b54074a7ea6e7cbf7 | |
| parent | 0c2d85d8c5b54fa860e54a0d9cd7c49616edda70 (diff) | |
| download | usermoji-58db2d7cc94023ae63d4c1c98eb5df74c0b62f0d.tar.xz | |
demos: Remove vulkaninfo dependency on DISPLAY
| -rw-r--r-- | demos/vulkaninfo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index 03714d01..205f4dc2 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -2435,10 +2435,10 @@ int main(int argc, char **argv) { int present_mode_count = 0; #if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) + bool has_display = true; if (getenv("DISPLAY") == NULL) { - printf("'DISPLAY' environment variable not set... Exiting!\n"); - fflush(stdout); - exit(1); + printf("'DISPLAY' environment variable not set... skipping surface info\n"); + has_display = false; } #endif @@ -2466,7 +2466,7 @@ int main(int argc, char **argv) { } //--XCB-- #elif VK_USE_PLATFORM_XCB_KHR - if (CheckExtensionEnabled(VK_KHR_XCB_SURFACE_EXTENSION_NAME, inst.inst_extensions, inst.inst_extensions_count)) { + if (has_display && CheckExtensionEnabled(VK_KHR_XCB_SURFACE_EXTENSION_NAME, inst.inst_extensions, inst.inst_extensions_count)) { AppCreateXcbWindow(&inst); for (uint32_t i = 0; i < gpu_count; i++) { AppCreateXcbSurface(&inst); @@ -2488,7 +2488,7 @@ int main(int argc, char **argv) { } //--XLIB-- #elif VK_USE_PLATFORM_XLIB_KHR - if (CheckExtensionEnabled(VK_KHR_XLIB_SURFACE_EXTENSION_NAME, inst.inst_extensions, inst.inst_extensions_count)) { + if (has_display && CheckExtensionEnabled(VK_KHR_XLIB_SURFACE_EXTENSION_NAME, inst.inst_extensions, inst.inst_extensions_count)) { AppCreateXlibWindow(&inst); for (uint32_t i = 0; i < gpu_count; i++) { AppCreateXlibSurface(&inst); |