diff --git a/.azure-pipelines/shared/build_jobs.yml b/.azure-pipelines/shared/build_jobs.yml
index c1d9fea..0e06f82 100644
--- a/.azure-pipelines/shared/build_jobs.yml
+++ b/.azure-pipelines/shared/build_jobs.yml
@@ -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
@@ -44,6 +44,8 @@ jobs:
# This job computes the product of the config dimensions
- job: generator
+ pool:
+ vmImage: "ubuntu-latest"
steps:
- task: PythonScript@0
name: winmatrix
@@ -51,6 +53,7 @@ jobs:
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
@@ -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:
diff --git a/.azure-pipelines/shared/check_clang_format.yml b/.azure-pipelines/shared/check_clang_format.yml
index 48c2e77..ce073a3 100644
--- a/.azure-pipelines/shared/check_clang_format.yml
+++ b/.azure-pipelines/shared/check_clang_format.yml
@@ -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
diff --git a/.azure-pipelines/shared/check_file_format.yml b/.azure-pipelines/shared/check_file_format.yml
index 3a028de..909cc6f 100644
--- a/.azure-pipelines/shared/check_file_format.yml
+++ b/.azure-pipelines/shared/check_file_format.yml
@@ -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)
diff --git a/.azure-pipelines/shared/codespell.yml b/.azure-pipelines/shared/codespell.yml
index 01c0fbe..4d9300c 100644
--- a/.azure-pipelines/shared/codespell.yml
+++ b/.azure-pipelines/shared/codespell.yml
@@ -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
diff --git a/CHANGELOG.SDK.md b/CHANGELOG.SDK.md
index 17b5588..09b1207 100644
--- a/CHANGELOG.SDK.md
+++ b/CHANGELOG.SDK.md
@@ -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,
@@ -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
diff --git a/include/openxr/openxr.h b/include/openxr/openxr.h
index 4acfdbc..8798e5a 100644
--- a/include/openxr/openxr.h
+++ b/include/openxr/openxr.h
@@ -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)
@@ -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 {
diff --git a/include/openxr/openxr_reflection.h b/include/openxr/openxr_reflection.h
index 1c85abd..2bc14be 100644
--- a/include/openxr/openxr_reflection.h
+++ b/include/openxr/openxr_reflection.h
@@ -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) \
diff --git a/specification/registry/xr.xml b/specification/registry/xr.xml
index 5b4975a..05e083f 100644
--- a/specification/registry/xr.xml
+++ b/specification/registry/xr.xml
@@ -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.
-->
// 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)
-
-
+
+