Skip to content

Commit

Permalink
OpenXR SDK 1.0.22 (2022-01-12)
Browse files Browse the repository at this point in the history
This release features a number of new extensions, as well as some
software updates and fixes, especially for Android. If you are using the
bundled jsoncpp, this is also a security release as the bundled jsoncpp
was upgraded to incorporate security improvements from upstream.

-   Registry
    -   Add new XR_FB_render_model vendor extension. (internal MR 2117,
        internal MR 2169)
    -   Add new XR_HTC_facial_expression vendor extension. (internal MR
        2120)
    -   Add new XR_FB_keyboard_tracking vendor extension. (internal MR
        2128)
    -   Add new XR_EXT_uuid multi-vendor extension. (internal MR 2152)
    -   Add new XR_FB_passthrough_keyboard_hands vendor extension.
        (internal MR 2162)
    -   Add new XR_HTC_vive_focus3_controller_interaction vendor
        extension. (internal MR 2178)
    -   Add new XR_ALMALENCE_digital_lens_control vendor extension.
        (OpenXR-Docs PR 104, internal issue 1615)
    -   Correct winding order for XR_MSFT_hand_tracking_mesh extension
        to clockwise to match runtime behavior. (internal MR 2151)
    -   Fix typos/naming convention errors in
        XR_FB_hand_tracking_capsules: rename
        XR_FB_HAND_TRACKING_CAPSULE_POINT_COUNT to
        XR_HAND_TRACKING_CAPSULE_POINT_COUNT_FB and
        XR_FB_HAND_TRACKING_CAPSULE_COUNT to
        XR_HAND_TRACKING_CAPSULE_COUNT_FB, providing the old names as
        compatibility aliases. (internal MR 1547, internal issue 1519)
    -   Reserve vendor extensions 208 - 299 for Facebook. (internal MR
        2158)
    -   Reserve extension numbers for anticipated multi-vendor
        extensions. (internal MR 2173)
-   SDK
    -   Android loader: Update vendored jnipp project, including
        crash/exception fixes if an application manually attached or
        detached a thread. (OpenXR-SDK-Source PR 286, OpenXR-SDK-Source
        PR 285)
    -   Docs: Fixed typo in docs. (OpenXR-SDK-Source PR 284)
    -   Fix detection of std::filesystem options on GCC 11 and newer.
        (OpenXR-SDK-Source PR 276, OpenXR-SDK-Source issue 260, internal
        issue 1571)
    -   Loader: Add ifdef guards around contents of Android-specific
        files so all platforms may still glob all source files in
        OpenXR-SDK to build the loader with a custom build system.
        (OpenXR-SDK-Source PR 274)
    -   Loader: Fixed incorrect return value when no broker is present
        on Android but runtime defined via active_runtime.json.
        (OpenXR-SDK-Source PR 284)
    -   Loader: Added /system to the search path on Android as per
        documentation. (OpenXR-SDK-Source PR 284)
    -   Loader doc: Use nativeLibraryDir (property, part of API) instead
        of getNativeLibraryDir() (function generated by wrapping
        library) (OpenXR-SDK-Source PR 278)
    -   Update vendored copy of jsoncpp from 1.8.4 to 1.9.5 for security
        and other fixes. (internal MR 2168, OpenXR-SDK-Source issue 265,
        internal issue 1582)
    -   Update android-jni-wrappers to fix missing include.
        (OpenXR-SDK-Source PR 280, OpenXR-SDK-Source issue 275, internal
        issue 1616)
    -   Update jnipp to fix crash on Android if app detaches thread from
        JVM (e.g. on shutdown). (OpenXR-SDK-Source PR 280)
    -   scripts: Populate ext_name in HandleData too, for use by
        language wrapper generation scripts. (internal MR 2184)

This release replaces 1.0.21.
  • Loading branch information
rpavlik committed Jan 12, 2022
1 parent a696e1b commit 458984d
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 14 deletions.
9 changes: 7 additions & 2 deletions .azure-pipelines/shared/build_jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
presentationBackend: wayland
pool:
vmImage: "ubuntu-latest"
container: khronosgroup/docker-images:openxr-sdk.202102
container: khronosgroup/docker-images:openxr-sdk.202110
steps:
# First build as debug
- template: build_linux.yml
Expand All @@ -44,13 +44,16 @@ jobs:

# This job computes the product of the config dimensions
- job: generator
pool:
vmImage: "ubuntu-latest"
steps:
- task: PythonScript@0
name: winmatrix
inputs:
scriptPath: $(System.DefaultWorkingDirectory)/.azure-pipelines/shared/generate_windows_matrix_build.py
# argument sets the variable name defined by python script
arguments: winbuild
pythonInterpreter: /usr/bin/python3

# Build the loader, API layers, and samples on Windows
- job: windows_build
Expand Down Expand Up @@ -95,7 +98,9 @@ jobs:
# useVulkan: 'true'

- job: combine_artifacts
dependsOn: windows_build
dependsOn:
- generator
- windows_build
condition: ${{ eq(parameters.isSdkSourceRepo, true) }}
displayName: "Organize artifacts"
pool:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/shared/check_clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
displayName: "clang-format"
pool:
vmImage: "ubuntu-latest"
container: khronosgroup/docker-images:openxr-sdk.202102
container: khronosgroup/docker-images:openxr-sdk.202110
steps:
- script: ./runClangFormat.sh
displayName: Run clang-format
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/shared/check_file_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
displayName: 'Check file formatting'
pool:
vmImage: 'ubuntu-latest'
container: khronosgroup/docker-images:openxr-sdk.202102
container: khronosgroup/docker-images:openxr-sdk.202110
steps:
- script: ./file_format.sh
displayName: File formatting checks (file_format.sh)
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/shared/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
displayName: "codespell"
pool:
vmImage: "ubuntu-latest"
container: khronosgroup/docker-images:openxr-sdk.202102
container: khronosgroup/docker-images:openxr-sdk.202110
steps:
- script: ./checkCodespell
displayName: Run Codespell script
7 changes: 6 additions & 1 deletion CHANGELOG.SDK.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ along with any public pull requests that have been accepted.
In this repository in particular, since it is primarily software,
pull requests may be integrated as they are accepted even between periodic updates.

## OpenXR SDK 1.0.21 (2022-01-10)
## OpenXR SDK 1.0.22 (2022-01-12)

This release features a number of new extensions, as well as some software
updates and fixes, especially for Android. If you are using the bundled jsoncpp,
Expand Down Expand Up @@ -96,6 +96,11 @@ incorporate security improvements from upstream.
generation scripts.
([internal MR 2184](https://gitlab.khronos.org/openxr/openxr/merge_requests/2184))

## OpenXR SDK 1.0.21 (2022-01-10)

This release was withdrawn due to a typo noticed after initial publication.
All changes are now listed under 1.0.22.

## OpenXR SDK 1.0.20 (2021-10-04)

This release includes a proposed cross-vendor OpenXR loader for Android, Android
Expand Down
6 changes: 3 additions & 3 deletions include/openxr/openxr.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extern "C" {
((((major) & 0xffffULL) << 48) | (((minor) & 0xffffULL) << 32) | ((patch) & 0xffffffffULL))

// OpenXR current version number.
#define XR_CURRENT_API_VERSION XR_MAKE_VERSION(1, 0, 21)
#define XR_CURRENT_API_VERSION XR_MAKE_VERSION(1, 0, 22)

#define XR_VERSION_MAJOR(version) (uint16_t)(((uint64_t)(version) >> 48)& 0xffffULL)
#define XR_VERSION_MINOR(version) (uint16_t)(((uint64_t)(version) >> 32) & 0xffffULL)
Expand Down Expand Up @@ -3297,8 +3297,8 @@ static const XrKeyboardTrackingFlagsFB XR_KEYBOARD_TRACKING_CONNECTED_BIT_FB = 0
typedef XrFlags64 XrKeyboardTrackingQueryFlagsFB;

// Flag bits for XrKeyboardTrackingQueryFlagsFB
static const XrKeyboardTrackingQueryFlagsFB XR_KEYBOARD_TRACKING_QUERY_LOCAL_BIT_FB = 0x00000001;
static const XrKeyboardTrackingQueryFlagsFB XR_KEYBOARD_TRACKING_QUERY_REMOTE_BIT_FB = 0x00000002;
static const XrKeyboardTrackingQueryFlagsFB XR_KEYBOARD_TRACKING_QUERY_LOCAL_BIT_FB = 0x00000002;
static const XrKeyboardTrackingQueryFlagsFB XR_KEYBOARD_TRACKING_QUERY_REMOTE_BIT_FB = 0x00000004;

// XrSystemKeyboardTrackingPropertiesFB extends XrSystemProperties
typedef struct XrSystemKeyboardTrackingPropertiesFB {
Expand Down
4 changes: 2 additions & 2 deletions include/openxr/openxr_reflection.h
Original file line number Diff line number Diff line change
Expand Up @@ -748,8 +748,8 @@ XR_ENUM_STR(XrResult);
_(XR_KEYBOARD_TRACKING_CONNECTED_BIT_FB, 0x00000008) \

#define XR_LIST_BITS_XrKeyboardTrackingQueryFlagsFB(_) \
_(XR_KEYBOARD_TRACKING_QUERY_LOCAL_BIT_FB, 0x00000001) \
_(XR_KEYBOARD_TRACKING_QUERY_REMOTE_BIT_FB, 0x00000002) \
_(XR_KEYBOARD_TRACKING_QUERY_LOCAL_BIT_FB, 0x00000002) \
_(XR_KEYBOARD_TRACKING_QUERY_REMOTE_BIT_FB, 0x00000004) \

#define XR_LIST_BITS_XrTriangleMeshFlagsFB(_) \
_(XR_TRIANGLE_MESH_MUTABLE_BIT_FB, 0x00000001) \
Expand Down
6 changes: 3 additions & 3 deletions specification/registry/xr.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ maintained in the default branch of the Khronos OpenXR GitHub project.
updates them automatically by processing a line at a time.
-->
<type category="define">// OpenXR current version number.
#define <name>XR_CURRENT_API_VERSION</name> <type>XR_MAKE_VERSION</type>(1, 0, 21)</type>
#define <name>XR_CURRENT_API_VERSION</name> <type>XR_MAKE_VERSION</type>(1, 0, 22)</type>

<!--
NOTE: For avoidance of ambiguity, there should only be 1 <name> tag immediately in
Expand Down Expand Up @@ -2694,8 +2694,8 @@ maintained in the default branch of the Khronos OpenXR GitHub project.

<!-- flags for XR_FB_keyboard_tracking query -->
<enums name="XrKeyboardTrackingQueryFlagBitsFB" type="bitmask">
<enum bitpos="0" name="XR_KEYBOARD_TRACKING_QUERY_LOCAL_BIT_FB" comment="indicates the query is for the physically tracked keyboard that is intended to be used in a local pairing with the System. Mutally exclusive with XR_KEYBOARD_TRACKING_QUERY_REMOTE_BIT_FB."/>
<enum bitpos="1" name="XR_KEYBOARD_TRACKING_QUERY_REMOTE_BIT_FB" comment="indicates the query is for the physically tracked keyboard that may be connected to a separate remote computing device. Mutally exclusive with XR_KEYBOARD_TRACKING_QUERY_LOCAL_BIT_FB."/>
<enum bitpos="1" name="XR_KEYBOARD_TRACKING_QUERY_LOCAL_BIT_FB" comment="indicates the query is for the physically tracked keyboard that is intended to be used in a local pairing with the System. Mutally exclusive with XR_KEYBOARD_TRACKING_QUERY_REMOTE_BIT_FB."/>
<enum bitpos="2" name="XR_KEYBOARD_TRACKING_QUERY_REMOTE_BIT_FB" comment="indicates the query is for the physically tracked keyboard that may be connected to a separate remote computing device. Mutally exclusive with XR_KEYBOARD_TRACKING_QUERY_LOCAL_BIT_FB."/>
</enums>

<!-- flags for XR_FB_space_warp -->
Expand Down

0 comments on commit 458984d

Please sign in to comment.