mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 12:46:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comp: Move nvidia whitelist warning so it is displayed again

Browse source
This commit is contained in:
Christoph Haag 2020-08-10 20:47:53 +02:00
parent 1e3508d2ce
commit 5ecd0a947d
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/xrt/compositor/main/comp_compositor.c
View file

@ -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;

17
src/xrt/compositor/main/comp_window_direct_nvidia.c
View file

@ -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;