mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Tidy order of extensions (NFC)

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-04-18 17:36:09 +01:00
parent 02435cc033
commit d24375f8ab
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/generate_oxr_ext_support.py
View file

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright 2019, Collabora, Ltd. # Copyright 2019-2022, Collabora, Ltd.
# SPDX-License-Identifier: BSL-1.0 # SPDX-License-Identifier: BSL-1.0
"""Simple script to update oxr_extension_support.h.""" """Simple script to update oxr_extension_support.h."""
@ -17,8 +17,8 @@ EXTENSIONS = (
['XR_KHR_composition_layer_equirect', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT1'], ['XR_KHR_composition_layer_equirect', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT1'],
['XR_KHR_composition_layer_equirect2', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT2'], ['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'],
['XR_KHR_loader_init_android', 'OXR_HAVE_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'],
['XR_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'], ['XR_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'],
['XR_KHR_loader_init_android', 'OXR_HAVE_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'],
['XR_KHR_opengl_enable', 'XR_USE_GRAPHICS_API_OPENGL'], ['XR_KHR_opengl_enable', 'XR_USE_GRAPHICS_API_OPENGL'],
['XR_KHR_opengl_es_enable', 'XR_USE_GRAPHICS_API_OPENGL_ES'], ['XR_KHR_opengl_es_enable', 'XR_USE_GRAPHICS_API_OPENGL_ES'],
['XR_KHR_swapchain_usage_input_attachment_bit'], ['XR_KHR_swapchain_usage_input_attachment_bit'],

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

@ -1,4 +1,4 @@
// Copyright 2019, Collabora, Ltd. // Copyright 2019-2022, Collabora, Ltd.
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
/*! /*!
* @file * @file
@ -100,17 +100,6 @@
#endif #endif
/*
* XR_KHR_loader_init_android
*/
#if defined(XR_KHR_loader_init_android) && defined(OXR_HAVE_KHR_loader_init) && defined(XR_USE_PLATFORM_ANDROID)
#define OXR_HAVE_KHR_loader_init_android
#define OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) _(KHR_loader_init_android, KHR_LOADER_INIT_ANDROID)
#else
#define OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_)
#endif
/* /*
* XR_KHR_loader_init * XR_KHR_loader_init
*/ */
@ -122,6 +111,17 @@
#endif #endif
/*
* XR_KHR_loader_init_android
*/
#if defined(XR_KHR_loader_init_android) && defined(OXR_HAVE_KHR_loader_init) && defined(XR_USE_PLATFORM_ANDROID)
#define OXR_HAVE_KHR_loader_init_android
#define OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) _(KHR_loader_init_android, KHR_LOADER_INIT_ANDROID)
#else
#define OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_)
#endif
/* /*
* XR_KHR_opengl_enable * XR_KHR_opengl_enable
*/ */
@ -298,8 +298,8 @@
OXR_EXTENSION_SUPPORT_KHR_composition_layer_equirect(_) \ OXR_EXTENSION_SUPPORT_KHR_composition_layer_equirect(_) \
OXR_EXTENSION_SUPPORT_KHR_composition_layer_equirect2(_) \ OXR_EXTENSION_SUPPORT_KHR_composition_layer_equirect2(_) \
OXR_EXTENSION_SUPPORT_KHR_convert_timespec_time(_) \ OXR_EXTENSION_SUPPORT_KHR_convert_timespec_time(_) \
OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) \
OXR_EXTENSION_SUPPORT_KHR_loader_init(_) \ OXR_EXTENSION_SUPPORT_KHR_loader_init(_) \
OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) \
OXR_EXTENSION_SUPPORT_KHR_opengl_enable(_) \ OXR_EXTENSION_SUPPORT_KHR_opengl_enable(_) \
OXR_EXTENSION_SUPPORT_KHR_opengl_es_enable(_) \ OXR_EXTENSION_SUPPORT_KHR_opengl_es_enable(_) \
OXR_EXTENSION_SUPPORT_KHR_swapchain_usage_input_attachment_bit(_) \ OXR_EXTENSION_SUPPORT_KHR_swapchain_usage_input_attachment_bit(_) \