The open source OpenXR runtime
st/oxr: Disable XR_KHR_convert_timespec_time on windows
This avoids a current CTS issue.
+4
-4
+1
-1
scripts/generate_oxr_ext_support.py
+1
-1
scripts/generate_oxr_ext_support.py
···
40
40
['XR_KHR_composition_layer_depth', 'XRT_FEATURE_OPENXR_LAYER_DEPTH'],
41
41
['XR_KHR_composition_layer_equirect', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT1'],
42
42
['XR_KHR_composition_layer_equirect2', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT2'],
43
-
['XR_KHR_convert_timespec_time', 'XR_USE_TIMESPEC'],
43
+
['XR_KHR_convert_timespec_time', 'XR_USE_TIMESPEC', not_('XR_USE_PLATFORM_WIN32')],
44
44
['XR_KHR_D3D11_enable', 'XR_USE_GRAPHICS_API_D3D11'],
45
45
['XR_KHR_D3D12_enable', 'XR_USE_GRAPHICS_API_D3D12'],
46
46
['XR_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'],
+2
-2
src/xrt/state_trackers/oxr/oxr_api_instance.c
+2
-2
src/xrt/state_trackers/oxr/oxr_api_instance.c
···
355
355
}
356
356
357
357
// ---- XR_KHR_convert_timespec_time extension
358
-
#ifdef XR_USE_TIMESPEC
358
+
#ifdef OXR_HAVE_KHR_convert_timespec_time
359
359
XrResult
360
360
oxr_xrConvertTimespecTimeToTimeKHR(XrInstance instance, const struct timespec *timespecTime, XrTime *time)
361
361
{
···
390
390
return oxr_instance_convert_time_to_timespec(&log, inst, time, timespecTime);
391
391
}
392
392
393
-
#endif // XR_USE_TIMESPEC
393
+
#endif // OXR_HAVE_KHR_convert_timespec_time
394
394
395
395
// ---- XR_KHR_win32_convert_performance_counter_time extension
396
396
#ifdef XR_USE_PLATFORM_WIN32
+1
-1
src/xrt/state_trackers/oxr/oxr_extension_support.h
+1
-1
src/xrt/state_trackers/oxr/oxr_extension_support.h
···
104
104
/*
105
105
* XR_KHR_convert_timespec_time
106
106
*/
107
-
#if defined(XR_KHR_convert_timespec_time) && defined(XR_USE_TIMESPEC)
107
+
#if defined(XR_KHR_convert_timespec_time) && defined(XR_USE_TIMESPEC) && (!defined(XR_USE_PLATFORM_WIN32))
108
108
#define OXR_HAVE_KHR_convert_timespec_time
109
109
#define OXR_EXTENSION_SUPPORT_KHR_convert_timespec_time(_) _(KHR_convert_timespec_time, KHR_CONVERT_TIMESPEC_TIME)
110
110
#else