The open source OpenXR runtime
src: Consistently append 1 to equirect1 code.
Rename XRT_FEATURE_OPENXR_LAYER_EQUIRECT_LEGACY to XRT_FEATURE_OPENXR_LAYER_EQUIRECT1.
Use correct define in verify_equirect1_layer function.
Rename equirect to equirect1.
meson: enable equirect1 by default.
authored by
Lubosz Sarnecki
and committed by
Jakob Bornecrantz
c8bdfae8
f334b8b6
+27
-27
+3
-3
CMakeLists.txt
+3
-3
CMakeLists.txt
···
147
147
if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_EQUIRECT2)
148
148
set(XRT_FEATURE_OPENXR_LAYER_EQUIRECT2 ON)
149
149
endif()
150
-
if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_EQUIRECT_LEGACY)
151
-
set(XRT_FEATURE_OPENXR_LAYER_EQUIRECT_LEGACY OFF)
150
+
if(NOT DEFINED XRT_FEATURE_OPENXR_LAYER_EQUIRECT1)
151
+
set(XRT_FEATURE_OPENXR_LAYER_EQUIRECT1 OFF)
152
152
endif()
153
153
154
154
# Most users won't touch these.
···
304
304
message(STATUS "# FEATURE_OPENXR_LAYER_CUBE: ${XRT_FEATURE_OPENXR_LAYER_CUBE}")
305
305
message(STATUS "# FEATURE_OPENXR_LAYER_CYLINDER: ${XRT_FEATURE_OPENXR_LAYER_CYLINDER}")
306
306
message(STATUS "# FEATURE_OPENXR_LAYER_EQUIRECT2: ${XRT_FEATURE_OPENXR_LAYER_EQUIRECT2}")
307
-
message(STATUS "# FEATURE_OPENXR_LAYER_EQUIRECT_LEGACY: ${XRT_FEATURE_OPENXR_LAYER_EQUIRECT_LEGACY}")
307
+
message(STATUS "# FEATURE_OPENXR_LAYER_EQUIRECT1: ${XRT_FEATURE_OPENXR_LAYER_EQUIRECT1}")
308
308
message(STATUS "# FEATURE_STEAMVR_PLUGIN: ${XRT_FEATURE_STEAMVR_PLUGIN}")
309
309
message(STATUS "#")
310
310
message(STATUS "# DRIVER_ANDROID: ${XRT_BUILD_DRIVER_ANDROID}")
+3
-3
meson_options.txt
+3
-3
meson_options.txt
···
96
96
description: 'Enable support for Cylinder Layers'
97
97
)
98
98
99
-
option('layer_equirect',
99
+
option('layer_equirect1',
100
100
type: 'boolean',
101
-
value: false,
102
-
description: 'Enable support for Equirect Layers'
101
+
value: true,
102
+
description: 'Enable support for legacy Equirect Layers'
103
103
)
104
104
105
105
option('layer_equirect2',
+1
-1
scripts/generate_oxr_ext_support.py
+1
-1
scripts/generate_oxr_ext_support.py
···
18
18
['XR_KHR_composition_layer_depth', 'XRT_FEATURE_OPENXR_LAYER_DEPTH'],
19
19
['XR_KHR_composition_layer_cube', 'XRT_FEATURE_OPENXR_LAYER_CUBE'],
20
20
['XR_KHR_composition_layer_cylinder', 'XRT_FEATURE_OPENXR_LAYER_CYLINDER'],
21
-
['XR_KHR_composition_layer_equirect', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT_LEGACY'],
21
+
['XR_KHR_composition_layer_equirect', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT1'],
22
22
['XR_KHR_composition_layer_equirect2', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT2'],
23
23
['XR_EXT_debug_utils'],
24
24
['XR_MND_headless'],
+2
-2
src/xrt/include/xrt/meson.build
+2
-2
src/xrt/include/xrt/meson.build
···
93
93
have_conf.set('XRT_FEATURE_OPENXR_LAYER_CYLINDER', true)
94
94
endif
95
95
96
-
if get_option('layer_equirect')
97
-
have_conf.set('XRT_FEATURE_OPENXR_LAYER_EQUIRECT_LEGACY', true)
96
+
if get_option('layer_equirect1')
97
+
have_conf.set('XRT_FEATURE_OPENXR_LAYER_EQUIRECT1', true)
98
98
endif
99
99
100
100
if get_option('layer_equirect2')
+1
-1
src/xrt/include/xrt/xrt_config_build.h.cmake_in
+1
-1
src/xrt/include/xrt/xrt_config_build.h.cmake_in
+1
-1
src/xrt/state_trackers/oxr/oxr_extension_support.h
+1
-1
src/xrt/state_trackers/oxr/oxr_extension_support.h
···
123
123
* XR_KHR_composition_layer_equirect
124
124
*/
125
125
#if defined(XR_KHR_composition_layer_equirect) && \
126
-
defined(XRT_FEATURE_OPENXR_LAYER_EQUIRECT_LEGACY)
126
+
defined(XRT_FEATURE_OPENXR_LAYER_EQUIRECT1)
127
127
#define OXR_HAVE_KHR_composition_layer_equirect
128
128
#define OXR_EXTENSION_SUPPORT_KHR_composition_layer_equirect(_) \
129
129
_(KHR_composition_layer_equirect, KHR_COMPOSITION_LAYER_EQUIRECT)
+16
-16
src/xrt/state_trackers/oxr/oxr_session.c
+16
-16
src/xrt/state_trackers/oxr/oxr_session.c
···
1217
1217
}
1218
1218
1219
1219
static XrResult
1220
-
verify_equirect_layer(struct xrt_compositor *xc,
1221
-
struct oxr_logger *log,
1222
-
uint32_t layer_index,
1223
-
const XrCompositionLayerEquirectKHR *equirect,
1224
-
struct xrt_device *head,
1225
-
uint64_t timestamp)
1220
+
verify_equirect1_layer(struct xrt_compositor *xc,
1221
+
struct oxr_logger *log,
1222
+
uint32_t layer_index,
1223
+
const XrCompositionLayerEquirectKHR *equirect,
1224
+
struct xrt_device *head,
1225
+
uint64_t timestamp)
1226
1226
{
1227
-
#ifndef XRT_FEATURE_OPENXR_LAYER_EQUIRECT2
1227
+
#ifndef XRT_FEATURE_OPENXR_LAYER_EQUIRECT1
1228
1228
return oxr_error(log, XR_ERROR_LAYER_INVALID,
1229
1229
"(frameEndInfo->layers[%u]->type) layer type "
1230
1230
"XrCompositionLayerEquirectKHR not supported",
···
1799
1799
}
1800
1800
1801
1801
static void
1802
-
submit_equirect_layer(struct oxr_session *sess,
1803
-
struct xrt_compositor *xc,
1804
-
struct oxr_logger *log,
1805
-
const XrCompositionLayerEquirectKHR *equirect,
1806
-
struct xrt_device *head,
1807
-
struct xrt_pose *inv_offset,
1808
-
uint64_t timestamp)
1802
+
submit_equirect1_layer(struct oxr_session *sess,
1803
+
struct xrt_compositor *xc,
1804
+
struct oxr_logger *log,
1805
+
const XrCompositionLayerEquirectKHR *equirect,
1806
+
struct xrt_device *head,
1807
+
struct xrt_pose *inv_offset,
1808
+
uint64_t timestamp)
1809
1809
{
1810
1810
// Not implemented
1811
1811
}
···
2016
2016
xdev, frameEndInfo->displayTime);
2017
2017
break;
2018
2018
case XR_TYPE_COMPOSITION_LAYER_EQUIRECT_KHR:
2019
-
res = verify_equirect_layer(
2019
+
res = verify_equirect1_layer(
2020
2020
xc, log, i, (XrCompositionLayerEquirectKHR *)layer,
2021
2021
xdev, frameEndInfo->displayTime);
2022
2022
break;
···
2081
2081
&inv_offset, timestamp);
2082
2082
break;
2083
2083
case XR_TYPE_COMPOSITION_LAYER_EQUIRECT_KHR:
2084
-
submit_equirect_layer(
2084
+
submit_equirect1_layer(
2085
2085
sess, xc, log,
2086
2086
(XrCompositionLayerEquirectKHR *)layer, xdev,
2087
2087
&inv_offset, timestamp);