The open source OpenXR runtime
st/oxr: Mix tidy [NFC]
+38
-34
+12
-10
src/xrt/state_trackers/oxr/oxr_extension_support.h
+12
-10
src/xrt/state_trackers/oxr/oxr_extension_support.h
···
385
385
386
386
387
387
/*
388
-
* XR_FB_display_refresh_rate
389
-
*/
390
-
#if defined(XR_FB_display_refresh_rate) && defined(XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE)
391
-
#define OXR_HAVE_FB_display_refresh_rate
392
-
#define OXR_EXTENSION_SUPPORT_FB_display_refresh_rate(_) _(FB_display_refresh_rate, FB_DISPLAY_REFRESH_RATE)
393
-
#else
394
-
#define OXR_EXTENSION_SUPPORT_FB_display_refresh_rate(_)
395
-
#endif
396
-
397
-
/*
398
388
* XR_FB_composition_layer_settings
399
389
*/
400
390
#if defined(XR_FB_composition_layer_settings) && defined(XRT_FEATURE_OPENXR_LAYER_FB_COMPOSITION_SETTINGS)
···
404
394
#else
405
395
#define OXR_EXTENSION_SUPPORT_FB_composition_layer_settings(_)
406
396
#endif
397
+
398
+
399
+
/*
400
+
* XR_FB_display_refresh_rate
401
+
*/
402
+
#if defined(XR_FB_display_refresh_rate) && defined(XRT_FEATURE_OPENXR_DISPLAY_REFRESH_RATE)
403
+
#define OXR_HAVE_FB_display_refresh_rate
404
+
#define OXR_EXTENSION_SUPPORT_FB_display_refresh_rate(_) _(FB_display_refresh_rate, FB_DISPLAY_REFRESH_RATE)
405
+
#else
406
+
#define OXR_EXTENSION_SUPPORT_FB_display_refresh_rate(_)
407
+
#endif
408
+
407
409
408
410
/*
409
411
* XR_ML_ml2_controller_interaction
+26
-24
src/xrt/state_trackers/oxr/oxr_session_frame_end.c
+26
-24
src/xrt/state_trackers/oxr/oxr_session_frame_end.c
···
131
131
return visibility;
132
132
}
133
133
134
+
#ifdef OXR_HAVE_FB_composition_layer_settings
135
+
static enum xrt_layer_composition_flags
136
+
convert_layer_settings_flags(XrCompositionLayerSettingsFlagsFB xr_layer_settings_flags)
137
+
{
138
+
enum xrt_layer_composition_flags layer_settings_flags = 0;
139
+
140
+
if ((xr_layer_settings_flags & XR_COMPOSITION_LAYER_SETTINGS_NORMAL_SUPER_SAMPLING_BIT_FB) != 0) {
141
+
layer_settings_flags |= XRT_COMPOSITION_LAYER_PROCESSING_NORMAL_SUPER_SAMPLING_BIT_FB;
142
+
}
143
+
144
+
if ((xr_layer_settings_flags & XR_COMPOSITION_LAYER_SETTINGS_QUALITY_SUPER_SAMPLING_BIT_FB) != 0) {
145
+
layer_settings_flags |= XRT_COMPOSITION_LAYER_PROCESSING_QUALITY_SUPER_SAMPLING_BIT_FB;
146
+
}
147
+
148
+
if ((xr_layer_settings_flags & XR_COMPOSITION_LAYER_SETTINGS_NORMAL_SHARPENING_BIT_FB) != 0) {
149
+
layer_settings_flags |= XRT_COMPOSITION_LAYER_PROCESSING_NORMAL_SHARPENING_BIT_FB;
150
+
}
151
+
152
+
if ((xr_layer_settings_flags & XR_COMPOSITION_LAYER_SETTINGS_QUALITY_SHARPENING_BIT_FB) != 0) {
153
+
layer_settings_flags |= XRT_COMPOSITION_LAYER_PROCESSING_QUALITY_SHARPENING_BIT_FB;
154
+
}
155
+
156
+
return layer_settings_flags;
157
+
}
158
+
#endif // OXR_HAVE_FB_composition_layer_settings
159
+
134
160
XRT_MAYBE_UNUSED static void
135
161
fill_in_xr_color(const struct XrColor4f *src, struct xrt_colour_rgba_f32 *dest)
136
162
{
···
159
185
fill_in_xr_color(&color_scale_bias->colorBias, &xlayer_data->color_bias);
160
186
}
161
187
#endif // OXR_HAVE_KHR_composition_layer_color_scale_bias
162
-
}
163
-
164
-
static enum xrt_layer_composition_flags
165
-
convert_layer_settings_flags(XrCompositionLayerSettingsFlagsFB xr_layer_settings_flags)
166
-
{
167
-
enum xrt_layer_composition_flags layer_settings_flags = 0;
168
-
169
-
if ((xr_layer_settings_flags & XR_COMPOSITION_LAYER_SETTINGS_NORMAL_SUPER_SAMPLING_BIT_FB) != 0) {
170
-
layer_settings_flags |= XRT_COMPOSITION_LAYER_PROCESSING_NORMAL_SUPER_SAMPLING_BIT_FB;
171
-
}
172
-
173
-
if ((xr_layer_settings_flags & XR_COMPOSITION_LAYER_SETTINGS_QUALITY_SUPER_SAMPLING_BIT_FB) != 0) {
174
-
layer_settings_flags |= XRT_COMPOSITION_LAYER_PROCESSING_QUALITY_SUPER_SAMPLING_BIT_FB;
175
-
}
176
-
177
-
if ((xr_layer_settings_flags & XR_COMPOSITION_LAYER_SETTINGS_NORMAL_SHARPENING_BIT_FB) != 0) {
178
-
layer_settings_flags |= XRT_COMPOSITION_LAYER_PROCESSING_NORMAL_SHARPENING_BIT_FB;
179
-
}
180
-
181
-
if ((xr_layer_settings_flags & XR_COMPOSITION_LAYER_SETTINGS_QUALITY_SHARPENING_BIT_FB) != 0) {
182
-
layer_settings_flags |= XRT_COMPOSITION_LAYER_PROCESSING_QUALITY_SHARPENING_BIT_FB;
183
-
}
184
-
185
-
return layer_settings_flags;
186
188
}
187
189
188
190
static void