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

comp: Guard more of the caps-detector with an ifdef.

Browse source
This commit is contained in:
Ryan Pavlik 2020-11-24 17:37:17 -06:00 committed by Jakob Bornecrantz
parent 8b4e3aafa5
commit ee755961fc
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1029,6 +1029,7 @@ _test_for_nvidia(struct comp_compositor *c, struct vk_bundle *vk)
static bool static bool
compositor_check_vulkan_caps(struct comp_compositor *c) compositor_check_vulkan_caps(struct comp_compositor *c)
{ {
#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
VkResult ret; VkResult ret;
// this is duplicative, but seems to be the easiest way to // this is duplicative, but seems to be the easiest way to
@ -1049,10 +1050,7 @@ compositor_check_vulkan_caps(struct comp_compositor *c)
} }
const char *extension_names[] = {COMP_INSTANCE_EXTENSIONS_COMMON, const char *extension_names[] = {COMP_INSTANCE_EXTENSIONS_COMMON,
#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT VK_KHR_DISPLAY_EXTENSION_NAME};
VK_KHR_DISPLAY_EXTENSION_NAME
#endif
};
VkInstanceCreateInfo instance_create_info = { VkInstanceCreateInfo instance_create_info = {
@ -1086,16 +1084,15 @@ compositor_check_vulkan_caps(struct comp_compositor *c)
return false; return false;
} }
#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
if (_test_for_nvidia(c, &temp_vk)) { if (_test_for_nvidia(c, &temp_vk)) {
c->settings.window_type = WINDOW_DIRECT_NVIDIA; c->settings.window_type = WINDOW_DIRECT_NVIDIA;
COMP_DEBUG(c, "Selecting direct NVIDIA window type!"); COMP_DEBUG(c, "Selecting direct NVIDIA window type!");
} }
#endif // VK_USE_PLATFORM_XLIB_XRANDR_EXT
temp_vk.vkDestroyDevice(temp_vk.device, NULL); temp_vk.vkDestroyDevice(temp_vk.device, NULL);
temp_vk.vkDestroyInstance(temp_vk.instance, NULL); temp_vk.vkDestroyInstance(temp_vk.instance, NULL);
#endif // VK_USE_PLATFORM_XLIB_XRANDR_EXT
return true; return true;
} }