The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

Ryan Pavlik and committed by
Jakob Bornecrantz
ee755961 8b4e3aaf

+3 -6
+3 -6
src/xrt/compositor/main/comp_compositor.c
··· 1029 1029 static bool 1030 1030 compositor_check_vulkan_caps(struct comp_compositor *c) 1031 1031 { 1032 + #ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT 1032 1033 VkResult ret; 1033 1034 1034 1035 // this is duplicative, but seems to be the easiest way to ··· 1049 1050 } 1050 1051 1051 1052 const char *extension_names[] = {COMP_INSTANCE_EXTENSIONS_COMMON, 1052 - #ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT 1053 - VK_KHR_DISPLAY_EXTENSION_NAME 1054 - #endif 1055 - }; 1053 + VK_KHR_DISPLAY_EXTENSION_NAME}; 1056 1054 1057 1055 1058 1056 VkInstanceCreateInfo instance_create_info = { ··· 1086 1084 return false; 1087 1085 } 1088 1086 1089 - #ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT 1090 1087 if (_test_for_nvidia(c, &temp_vk)) { 1091 1088 c->settings.window_type = WINDOW_DIRECT_NVIDIA; 1092 1089 COMP_DEBUG(c, "Selecting direct NVIDIA window type!"); 1093 1090 } 1094 - #endif // VK_USE_PLATFORM_XLIB_XRANDR_EXT 1095 1091 1096 1092 temp_vk.vkDestroyDevice(temp_vk.device, NULL); 1097 1093 temp_vk.vkDestroyInstance(temp_vk.instance, NULL); 1098 1094 1095 + #endif // VK_USE_PLATFORM_XLIB_XRANDR_EXT 1099 1096 return true; 1100 1097 } 1101 1098