mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 02:26:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Disable XR_KHR_convert_timespec_time on windows

Browse source 
This avoids a current CTS issue.
This commit is contained in:
Christoph Haag 2022-10-19 23:21:16 +02:00
parent a5923a5d4d
commit 7dd0a6e473
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/generate_oxr_ext_support.py
View file

@ -40,7 +40,7 @@ EXTENSIONS = (
['XR_KHR_composition_layer_depth', 'XRT_FEATURE_OPENXR_LAYER_DEPTH'],
['XR_KHR_composition_layer_equirect', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT1'],
['XR_KHR_composition_layer_equirect2', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT2'],
['XR_KHR_convert_timespec_time', 'XR_USE_TIMESPEC'],
['XR_KHR_convert_timespec_time', 'XR_USE_TIMESPEC', not_('XR_USE_PLATFORM_WIN32')],
['XR_KHR_D3D11_enable', 'XR_USE_GRAPHICS_API_D3D11'],
['XR_KHR_D3D12_enable', 'XR_USE_GRAPHICS_API_D3D12'],
['XR_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'],

4
src/xrt/state_trackers/oxr/oxr_api_instance.c
View file

@ -355,7 +355,7 @@ oxr_xrPathToString(
}
// ---- XR_KHR_convert_timespec_time extension
#ifdef XR_USE_TIMESPEC
#ifdef OXR_HAVE_KHR_convert_timespec_time
XrResult
oxr_xrConvertTimespecTimeToTimeKHR(XrInstance instance, const struct timespec *timespecTime, XrTime *time)
{
@ -390,7 +390,7 @@ oxr_xrConvertTimeToTimespecTimeKHR(XrInstance instance, XrTime time, struct time
return oxr_instance_convert_time_to_timespec(&log, inst, time, timespecTime);
}
#endif // XR_USE_TIMESPEC
#endif // OXR_HAVE_KHR_convert_timespec_time
// ---- XR_KHR_win32_convert_performance_counter_time extension
#ifdef XR_USE_PLATFORM_WIN32

2
src/xrt/state_trackers/oxr/oxr_extension_support.h
View file

@ -104,7 +104,7 @@
/*
* XR_KHR_convert_timespec_time
*/
#if defined(XR_KHR_convert_timespec_time) && defined(XR_USE_TIMESPEC)
#if defined(XR_KHR_convert_timespec_time) && defined(XR_USE_TIMESPEC) && (!defined(XR_USE_PLATFORM_WIN32))
#define OXR_HAVE_KHR_convert_timespec_time
#define OXR_EXTENSION_SUPPORT_KHR_convert_timespec_time(_) _(KHR_convert_timespec_time, KHR_CONVERT_TIMESPEC_TIME)
#else