mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-02-03 12:28:07 +00:00
st/oxr: Make Vulkan optional
This commit is contained in:
parent
e82fafb186
commit
e0bf0a423f
src/xrt/state_trackers/oxr
|
@ -87,7 +87,6 @@ target_link_libraries(st_oxr PRIVATE
|
|||
aux-includes
|
||||
PUBLIC
|
||||
aux_os
|
||||
Vulkan::Vulkan
|
||||
)
|
||||
if(XRT_HAVE_VULKAN)
|
||||
target_link_libraries(st_oxr PRIVATE Vulkan::Vulkan)
|
||||
|
|
|
@ -1092,9 +1092,11 @@ struct oxr_system
|
|||
uint32_t num_blend_modes;
|
||||
XrEnvironmentBlendMode blend_modes[3];
|
||||
|
||||
#ifdef XR_USE_GRAPHICS_API_VULKAN
|
||||
//! The instance/device we create when vulkan_enable2 is used
|
||||
VkInstance vulkan_enable2_instance;
|
||||
VkPhysicalDevice vulkan_enable2_physical_device;
|
||||
#endif
|
||||
};
|
||||
|
||||
#define GET_XDEV_BY_ROLE(SYS, ROLE) SYS->role.ROLE == XRT_DEVICE_ROLE_UNASSIGNED ? NULL : SYS->xdevs[SYS->role.ROLE]
|
||||
|
|
|
@ -99,8 +99,10 @@ oxr_system_fill_in(struct oxr_logger *log, struct oxr_instance *inst, XrSystemId
|
|||
sys->form_factor = XR_FORM_FACTOR_HEAD_MOUNTED_DISPLAY;
|
||||
sys->view_config_type = XR_VIEW_CONFIGURATION_TYPE_PRIMARY_STEREO;
|
||||
|
||||
#ifdef XR_USE_GRAPHICS_API_VULKAN
|
||||
sys->vulkan_enable2_instance = VK_NULL_HANDLE;
|
||||
sys->vulkan_enable2_physical_device = VK_NULL_HANDLE;
|
||||
#endif
|
||||
|
||||
// Headless.
|
||||
if (sys->xsysc == NULL) {
|
||||
|
|
Loading…
Reference in a new issue