+1

scripts/generate_oxr_ext_support.py

reviewed

··· 45 45 ['XR_KHR_convert_timespec_time', 'XR_USE_TIMESPEC', not_('XR_USE_PLATFORM_WIN32')], 46 46 ['XR_KHR_D3D11_enable', 'XR_USE_GRAPHICS_API_D3D11'], 47 47 ['XR_KHR_D3D12_enable', 'XR_USE_GRAPHICS_API_D3D12'], 48 48 + ['XR_KHR_extended_struct_name_lengths'], 48 49 ['XR_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'], 49 50 ['XR_KHR_loader_init_android', 'OXR_HAVE_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'], 50 51 ['XR_KHR_locate_spaces'],

+8

src/xrt/state_trackers/oxr/oxr_api_funcs.h

reviewed

··· 117 117 oxr_xrConvertTimeToWin32PerformanceCounterKHR(XrInstance instance, XrTime time, LARGE_INTEGER *performanceCounter); 118 118 #endif // XR_USE_PLATFORM_WIN32 119 119 120 120 + #ifdef OXR_HAVE_KHR_extended_struct_name_lengths 121 121 + //! OpenXR API function @ep{xrStructureTypeToString2KHR} 122 122 + XRAPI_ATTR XrResult XRAPI_CALL 123 123 + oxr_xrStructureTypeToString2KHR(XrInstance instance, 124 124 + XrStructureType value, 125 125 + char buffer[XR_MAX_STRUCTURE_NAME_SIZE_EXTENDED_KHR]); 126 126 + #endif // OXR_HAVE_KHR_extended_struct_name_lengths 127 127 + 120 128 /* 121 129 * 122 130 * oxr_api_system.c

+30

src/xrt/state_trackers/oxr/oxr_api_instance.c

reviewed

··· 290 290 default: snprintf(buffer, XR_MAX_STRUCTURE_NAME_SIZE, "XR_UNKNOWN_STRUCTURE_TYPE_%d", value); 291 291 } 292 292 // The function snprintf always null terminates. 293 293 + #undef MAKE_TYPE_CASE 294 294 + return XR_SUCCESS; 295 295 + } 293 296 297 297 + // ---- XR_KHR_extended_struct_name_lengths extension 298 298 + #ifdef OXR_HAVE_KHR_extended_struct_name_lengths 299 299 + XRAPI_ATTR XrResult XRAPI_CALL 300 300 + oxr_xrStructureTypeToString2KHR(XrInstance instance, 301 301 + XrStructureType value, 302 302 + char buffer[XR_MAX_STRUCTURE_NAME_SIZE_EXTENDED_KHR]) 303 303 + { 304 304 + OXR_TRACE_MARKER(); 305 305 + 306 306 + struct oxr_instance *inst; 307 307 + struct oxr_logger log; 308 308 + OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrStructureTypeToString2KHR"); 309 309 + OXR_VERIFY_EXTENSION(&log, inst, KHR_extended_struct_name_lengths); 310 310 + 311 311 + static_assert(XR_MAX_STRUCTURE_NAME_SIZE_EXTENDED_KHR == 256, 312 312 + "XR_MAX_STRUCTURE_NAME_SIZE_EXTENDED_KHR has changed, please update the format string"); 313 313 + 314 314 + #define MAKE_TYPE_CASE(VAL, _) \ 315 315 + case VAL: snprintf(buffer, XR_MAX_STRUCTURE_NAME_SIZE_EXTENDED_KHR, "%.255s", #VAL); break; 316 316 + 317 317 + switch (value) { 318 318 + XR_LIST_ENUM_XrStructureType(MAKE_TYPE_CASE); 319 319 + default: snprintf(buffer, XR_MAX_STRUCTURE_NAME_SIZE_EXTENDED_KHR, "XR_UNKNOWN_STRUCTURE_TYPE_%d", value); 320 320 + } 321 321 + // The function snprintf always null terminates. 322 322 + #undef MAKE_TYPE_CASE 294 323 return XR_SUCCESS; 295 324 } 325 325 + #endif // OXR_HAVE_KHR_extended_struct_name_lengths 296 326 297 327 XRAPI_ATTR XrResult XRAPI_CALL 298 328 oxr_xrStringToPath(XrInstance instance, const char *pathString, XrPath *out_path)

+4

src/xrt/state_trackers/oxr/oxr_api_negotiate.c

reviewed

··· 360 360 ENTRY_IF_EXT(xrCreateXDevSpaceMNDX, MNDX_xdev_space); 361 361 #endif // OXR_HAVE_MNDX_xdev_space 362 362 363 363 + #ifdef OXR_HAVE_KHR_extended_struct_name_lengths 364 364 + ENTRY_IF_EXT(xrStructureTypeToString2KHR, KHR_extended_struct_name_lengths); 365 365 + #endif // OXR_HAVE_KHR_extended_struct_name_lengths 366 366 + 363 367 #ifdef OXR_HAVE_KHR_locate_spaces 364 368 ENTRY_IF_EXT(xrLocateSpacesKHR, KHR_locate_spaces); 365 369 #endif

+13

src/xrt/state_trackers/oxr/oxr_extension_support.h

reviewed

··· 158 158 159 159 160 160 /* 161 161 + * XR_KHR_extended_struct_name_lengths 162 162 + */ 163 163 + #if defined(XR_KHR_extended_struct_name_lengths) 164 164 + #define OXR_HAVE_KHR_extended_struct_name_lengths 165 165 + #define OXR_EXTENSION_SUPPORT_KHR_extended_struct_name_lengths(_) \ 166 166 + _(KHR_extended_struct_name_lengths, KHR_EXTENDED_STRUCT_NAME_LENGTHS) 167 167 + #else 168 168 + #define OXR_EXTENSION_SUPPORT_KHR_extended_struct_name_lengths(_) 169 169 + #endif 170 170 + 171 171 + 172 172 + /* 161 173 * XR_KHR_loader_init 162 174 */ 163 175 #if defined(XR_KHR_loader_init) && defined(XR_USE_PLATFORM_ANDROID) ··· 805 817 OXR_EXTENSION_SUPPORT_KHR_convert_timespec_time(_) \ 806 818 OXR_EXTENSION_SUPPORT_KHR_D3D11_enable(_) \ 807 819 OXR_EXTENSION_SUPPORT_KHR_D3D12_enable(_) \ 820 820 + OXR_EXTENSION_SUPPORT_KHR_extended_struct_name_lengths(_) \ 808 821 OXR_EXTENSION_SUPPORT_KHR_loader_init(_) \ 809 822 OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) \ 810 823 OXR_EXTENSION_SUPPORT_KHR_locate_spaces(_) \