From 5ecd0a947d09ae9381502e09b577d1c7d73ffa64 Mon Sep 17 00:00:00 2001 From: Christoph Haag Date: Mon, 10 Aug 2020 20:47:53 +0200 Subject: [PATCH] comp: Move nvidia whitelist warning so it is displayed again --- src/xrt/compositor/main/comp_compositor.c | 11 +++++++++++ .../compositor/main/comp_window_direct_nvidia.c | 17 ----------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/xrt/compositor/main/comp_compositor.c b/src/xrt/compositor/main/comp_compositor.c index 1669696df..fef8732aa 100644 --- a/src/xrt/compositor/main/comp_compositor.c +++ b/src/xrt/compositor/main/comp_compositor.c @@ -777,6 +777,17 @@ _test_for_nvidia(struct comp_compositor *c, struct vk_bundle *vk) } } + COMP_ERROR(c, "NVIDIA: No whitelisted displays found!"); + + COMP_ERROR(c, "== Current Whitelist =="); + for (uint32_t i = 0; i < ARRAY_SIZE(NV_DIRECT_WHITELIST); i++) + COMP_ERROR(c, "%s", NV_DIRECT_WHITELIST[i]); + + COMP_ERROR(c, "== Found Displays =="); + for (uint32_t i = 0; i < display_count; i++) + COMP_ERROR(c, "%s", display_props[i].displayName); + + free(display_props); return false; diff --git a/src/xrt/compositor/main/comp_window_direct_nvidia.c b/src/xrt/compositor/main/comp_window_direct_nvidia.c index 4462fad94..4e730cbde 100644 --- a/src/xrt/compositor/main/comp_window_direct_nvidia.c +++ b/src/xrt/compositor/main/comp_window_direct_nvidia.c @@ -209,23 +209,6 @@ comp_window_direct_nvidia_init(struct comp_window *w) break; } - if (w_direct->num_displays == 0) { - COMP_ERROR(w->c, - "NVIDIA: No machting displays found. " - "Is your headset whitelisted?"); - - COMP_ERROR(w->c, "== Whitelist =="); - for (uint32_t i = 0; i < ARRAY_SIZE(NV_DIRECT_WHITELIST); i++) - COMP_ERROR(w->c, "%s", NV_DIRECT_WHITELIST[i]); - - COMP_ERROR(w->c, "== Available =="); - for (uint32_t i = 0; i < display_count; i++) - COMP_ERROR(w->c, "%s", display_props[i].displayName); - - free(display_props); - return false; - } - free(display_props); return true;