Merge branch 'devel' into approved

1.0.29.0 approved release.

Approved by WG 7-Sept-2023.

.azure-pipelines/shared/build_jobs.yml

@@ -26,7 +26,8 @@ jobs:
           presentationBackend: wayland
     pool:
       vmImage: "ubuntu-latest"
-    container: khronosgroup/docker-images:openxr-sdk.20230209
+    container: khronosgroup/docker-images:openxr-sdk.20230323
+    # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
     steps:
       # First build as debug
       - template: build_linux.yml
@@ -130,7 +131,7 @@ jobs:
       # Use the specified version of Python from the tool cache
       - task: UsePythonVersion@0
         inputs:
-          versionSpec: "3.9"
+          versionSpec: "3.10"
       - task: PythonScript@0
         displayName: Move artifact contents
         inputs:

.azure-pipelines/shared/check_clang_format.yml

@@ -6,7 +6,8 @@ jobs:
     displayName: "clang-format"
     pool:
       vmImage: "ubuntu-latest"
-    container: khronosgroup/docker-images:openxr-sdk.20230209
+    container: khronosgroup/docker-images:openxr-sdk.20230323
+    # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
     steps:
       - script: ./runClangFormat.sh
         displayName: Run clang-format

.azure-pipelines/shared/check_file_format.yml

@@ -5,7 +5,8 @@ jobs:
   displayName: 'Check file formatting'
   pool:
     vmImage: 'ubuntu-latest'
-  container: khronosgroup/docker-images:openxr-sdk.20230209
+  container: khronosgroup/docker-images:openxr-sdk.20230323
+  # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
   steps:
     - script: ./file_format.sh
       displayName: File formatting checks (file_format.sh)

.azure-pipelines/shared/codespell.yml

@@ -6,7 +6,8 @@ jobs:
     displayName: "codespell"
     pool:
       vmImage: "ubuntu-latest"
-    container: khronosgroup/docker-images:openxr-sdk.20230209
+    container: khronosgroup/docker-images:openxr-sdk.20230323
+    # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
     steps:
       - script: ./checkCodespell
         displayName: Run Codespell script

.azure-pipelines/shared/generate_windows_matrix_build.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2023, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 from itertools import product

.azure-pipelines/shared/install_vulkan.ps1

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2023, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 if (-not $env:VULKAN_SDK_VERSION) {

.azure-pipelines/shared/organize_windows_artifacts.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2023, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 from itertools import product

.azure-pipelines/shared/print_windows_artifact_names.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2023, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 from itertools import product

.azure-pipelines/shared/shared.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2023, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 import json

.git-blame-ignore-revs

@@ -9,8 +9,11 @@
 # and do try to make sure that the bulk change is made
 # **separate from a release commit** on all repos.
 # See <https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt>
-# for how to use this.
+# for how to use this, probably something like:
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
 
+## Old changes
+767537d9523253de1615b01450a8b22c8e2cc6a2
 
 ## 1.0.17 - Fix XML indentation
 

.gitattributes

@@ -23,7 +23,10 @@
 *.sh      eol=lf
 
 *.png     binary
-*.pdf     binary
+
+# git-lfs big files
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.glb filter=lfs diff=lfs merge=lfs -text
 
 # Shell/python scripts that don't end in .sh
 specification/makeAllExts           eol=lf

.github/scripts/generate_windows_matrix_build.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2023, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 from itertools import product

.github/scripts/shared.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2023, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 import json

.github/workflows/android-cts-build.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Get modern CMake and Ninja
-        uses: lukka/[email protected].3
+        uses: lukka/[email protected].4
 
       - name: set up JDK 11
         uses: actions/setup-java@v3

.github/workflows/android-cts-pr.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Get modern CMake and Ninja
-        uses: lukka/[email protected].3
+        uses: lukka/[email protected].4
 
       - name: set up JDK 11
         uses: actions/setup-java@v3

.github/workflows/msvc-build-preset.yml

@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Get modern CMake and Ninja
-        uses: lukka/[email protected].3
+        uses: lukka/[email protected].4
 
       - name: Add msbuild to PATH
         uses: microsoft/[email protected]

.gitignore

@@ -18,6 +18,7 @@ pregen/
 generated-includes
 cmake_install.cmake
 cmake_uninstall.cmake
+cmake-build-*
 
 # Marker file for a snapshot build
 SNAPSHOT
@@ -53,6 +54,7 @@ local.properties
 
 # Don't ignore these things
 !.*.license
+!.artifact-bot.md
 !.appveyor.yml
 !.azure-pipelines/
 !.azure-pipelines/nuget/NugetTemplate/build

.reuse/dep5

@@ -3,7 +3,13 @@ Upstream-Name: OpenXR
 Upstream-Contact: Ryan Pavlik <openxr-speceditor AT khronos DOT org>
 Source: https://khronos.org/registry/OpenXR/
 
-Files: changes/*
+Files: changes/conformance/*
+       changes/registry/*
+       changes/sdk/*
+       changes/specification/*
+       changes/README.md
+       changes/template.md
+       HOTFIX
 Copyright: 2019-2023, The Khronos Group Inc.
 License: CC-BY-4.0
 
@@ -29,15 +35,33 @@ Comment: Based on a Material Icons asset ("emoji-people") with added text
   Rasterized with Android Studio.
 
 Files: src/external/catch2/*
-Copyright: Copyright (c) 2022 Two Blue Cubes Ltd.
+Copyright: Copyright (c) 2023 Two Blue Cubes Ltd.
 License: BSL-1.0
-Comment: Unmodified, vendored copy of Catch2 3.1.1
+Comment: Unmodified, vendored copy of Catch2 v3.3.2
 
 Files: src/external/jsoncpp/*
 Copyright: 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
 License: MIT OR LicenseRef-jsoncpp-public-domain
 Comment: Unmodified, vendored copy of jsoncpp 1.9.5
 
+Files: src/external/tinygltf/README.md
+  src/external/tinygltf/tiny_gltf.cc
+  src/external/tinygltf/tiny_gltf.h
+Copyright: 2015-Present, Syoyo Fujita, Aurélien Chatelain and many contributors
+License: MIT
+Comment: Unmodified, vendored copy of a subset of the tiny-gltf repo v2.8.9
+
+Files: src/external/d3dx12/*
+Copyright: Copyright (c) Microsoft Corporation.
+License: MIT
+Comment: Unmodified, vendored copy of d3dx12.h from directx-vs-templates commit 86b9c45
+  This repo includes ifdefs to improve compatibility with older Windows SDK verions.
+
+Files: src/external/mikktspace/*
+Copyright: 2011 by Morten S. Mikkelsen
+License: Zlib
+Comment: Unmodified, vendored copy of MikkTSpace commit 3e895b4
+
 Files: src/external/jnipp/*
 Copyright: 2016-2020, Mitchell Dowd
   2020, Collabora, Ltd.
@@ -60,14 +84,9 @@ Copyright: 2020, Epic Games, Inc.
 License: CC-BY-4.0
 Comment: In-line license comments requested, https://gitlab.khronos.org/openxr/openxr/-/issues/1422
 
-Files: specification/sources/chapters/extensions/oculus/oculus_android_session_state_enable.adoc
-Copyright: 2019, Oculus VR, LLC.
-License: CC-BY-4.0
-Comment: In-line license comments requested, https://gitlab.khronos.org/openxr/openxr/-/issues/1418
-
 Files: specification/sources/chapters/extensions/ext/ext_performance_settings.adoc
   specification/sources/chapters/extensions/ext/ext_thermal_query.adoc
-Copyright: 2017-2020, The Khronos Group Inc.
+Copyright: 2017-2023, The Khronos Group Inc.
 License: CC-BY-4.0
 Comment: In-line license comments requested, https://gitlab.khronos.org/openxr/openxr/-/issues/1419
 
@@ -76,7 +95,7 @@ Files: src/conformance/platform_specific/android_resources/mipmap-hdpi/*
   src/conformance/platform_specific/android_resources/mipmap-xhdpi/*
   src/conformance/platform_specific/android_resources/mipmap-xxhdpi/*
   src/conformance/platform_specific/android_resources/mipmap-xxxhdpi/*
-Copyright: 2020, The Khronos Group Inc.
+Copyright: 2020-2023, The Khronos Group Inc.
   2020, Google
 License: Apache-2.0
 Comment: Generated .png versions of an icon, created in Android Studio

BUILDING.md

@@ -142,6 +142,21 @@ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../..
 make
 ```
 
+### macOS
+
+Building the OpenXR components in this tree on macOS is supported using Xcode
+14.0 and newer. You may need to install Xcode Command Line Tools and cmake.
+
+First, generate the Xcode project file using CMake:
+
+```cmd
+mkdir -p build/macos
+cd build/macos
+cmake -G "Xcode" ../..
+```
+
+Finally, open the build/macos/OPENXR.xcodeproj in Xcode to build the samples.
+
 ### Android
 
 ```sh

CHANGELOG.CTS.md

@@ -17,6 +17,110 @@ particular, since it is primarily software, pull requests may be integrated as
 they are accepted even between periodic updates. However, versions that are not
 signed tags on the `approved` branch are not valid for conformance submission.
 
+## OpenXR CTS 1.0.29.0 (2023-09-07)
+
+- Conformance Tests
+  - Fix: Use actual acquired image index in swapchain rendering test.
+    ([internal MR 2746](https://gitlab.khronos.org/openxr/openxr/merge_requests/2746))
+  - Fix: Do not use Catch2 assertion macros in graphics plugin methods that may be
+    called before the first test case execution begins.
+    ([internal MR 2756](https://gitlab.khronos.org/openxr/openxr/merge_requests/2756),
+    [internal issue 1387](https://gitlab.khronos.org/openxr/openxr/issues/1387))
+  - Fix: spelling.
+    ([internal MR 2766](https://gitlab.khronos.org/openxr/openxr/merge_requests/2766))
+  - Fix: Fix `<queries>` element contents in Android manifest.
+    ([internal MR 2840](https://gitlab.khronos.org/openxr/openxr/merge_requests/2840),
+    [internal issue 2053](https://gitlab.khronos.org/openxr/openxr/issues/2053))
+  - Fix: Allow building CTS with mingw compiler.
+    ([internal MR 2850](https://gitlab.khronos.org/openxr/openxr/merge_requests/2850))
+  - Fix: Do not create an `XrInstance` during XML writing process, to prevent
+    possible crash if one already exists.
+    ([internal MR 2927](https://gitlab.khronos.org/openxr/openxr/merge_requests/2927))
+  - Improvement: Refactor utilities that do not depend on Catch2 into a separate
+    internal library.
+    ([internal MR 2669](https://gitlab.khronos.org/openxr/openxr/merge_requests/2669))
+  - Improvement: Refactor and standardize creation of swapchain image format
+    tables, fixing some Vulkan invalid usage.
+    ([internal MR 2685](https://gitlab.khronos.org/openxr/openxr/merge_requests/2685),
+    [internal issue 1978](https://gitlab.khronos.org/openxr/openxr/issues/1978))
+  - Improvement: Make composition test help/example world locked but based on
+    initial view, for more natural reading.
+    ([internal MR 2689](https://gitlab.khronos.org/openxr/openxr/merge_requests/2689))
+  - Improvement: Cleanup and code quality work.
+    ([internal MR 2704](https://gitlab.khronos.org/openxr/openxr/merge_requests/2704),
+    [internal MR 2717](https://gitlab.khronos.org/openxr/openxr/merge_requests/2717),
+    [internal MR 2784](https://gitlab.khronos.org/openxr/openxr/merge_requests/2784),
+    [internal MR 2785](https://gitlab.khronos.org/openxr/openxr/merge_requests/2785),
+    [internal MR 2808](https://gitlab.khronos.org/openxr/openxr/merge_requests/2808),
+    [internal MR 2809](https://gitlab.khronos.org/openxr/openxr/merge_requests/2809))
+  - Improvement: Add separate license file for gradlew and gradlew.bat
+    ([internal MR 2725](https://gitlab.khronos.org/openxr/openxr/merge_requests/2725))
+  - Improvement: Optionally poll `xrGetSystem` before running test cases.
+    ([internal MR 2735](https://gitlab.khronos.org/openxr/openxr/merge_requests/2735),
+    [OpenXR-CTS issue 53](https://github.com/KhronosGroup/OpenXR-CTS/issues/53),
+    [internal issue 1947](https://gitlab.khronos.org/openxr/openxr/issues/1947))
+  - Improvement: Select the first enumerated environment blend mode by default,
+    rather than always using "opaque"
+    ([internal MR 2736](https://gitlab.khronos.org/openxr/openxr/merge_requests/2736),
+    [internal issue 1950](https://gitlab.khronos.org/openxr/openxr/issues/1950))
+  - Improvement: Migrate more tests to use the `SKIP` macro when appropriate.
+    ([internal MR 2737](https://gitlab.khronos.org/openxr/openxr/merge_requests/2737),
+    [internal issue 1932](https://gitlab.khronos.org/openxr/openxr/issues/1932))
+  - Improvement: Change background color based on selected blend mode: black for
+    additive and transparent for alpha blend.
+    ([internal MR 2883](https://gitlab.khronos.org/openxr/openxr/merge_requests/2883),
+    [internal issue 1949](https://gitlab.khronos.org/openxr/openxr/issues/1949))
+  - Improvement: Add extra information to errors in case of CTS timeouts.
+    ([internal MR 2889](https://gitlab.khronos.org/openxr/openxr/merge_requests/2889))
+  - Improvement: Remove conditional `XR_KHR_headless` support as the extension is
+    not part of OpenXR 1.0.
+    ([internal MR 2901](https://gitlab.khronos.org/openxr/openxr/merge_requests/2901))
+  - Improvement: Remove empty `XR_EXT_performance_settings` test that was never
+    implemented
+    ([internal MR 2902](https://gitlab.khronos.org/openxr/openxr/merge_requests/2902))
+  - Improvement: Fix names of tests to not have spaces, and adjust tags so that the
+    instructions in the README will cause all tests to be executed.
+    ([internal MR 2924](https://gitlab.khronos.org/openxr/openxr/merge_requests/2924))
+  - New test: Verify two-call idiom behavior of `XR_MSFT_controller_model` as well
+    as handling of invalid model keys.
+    ([internal MR 2387](https://gitlab.khronos.org/openxr/openxr/merge_requests/2387),
+    [internal MR 2858](https://gitlab.khronos.org/openxr/openxr/merge_requests/2858))
+  - New test: Added `XR_EXT_plane_detection` extension.
+    ([internal MR 2510](https://gitlab.khronos.org/openxr/openxr/merge_requests/2510),
+    [internal MR 2751](https://gitlab.khronos.org/openxr/openxr/merge_requests/2751),
+    [internal MR 2676](https://gitlab.khronos.org/openxr/openxr/merge_requests/2676))
+  - New test: Add non-interactive test for `XR_EXT_palm_pose` vendor extension.
+    ([internal MR 2672](https://gitlab.khronos.org/openxr/openxr/merge_requests/2672))
+  - New test: Add joint query to non-interactive test for `XR_EXT_hand_tracking`.
+    ([internal MR 2729](https://gitlab.khronos.org/openxr/openxr/merge_requests/2729),
+    [internal MR 2795](https://gitlab.khronos.org/openxr/openxr/merge_requests/2795),
+    [internal MR 2858](https://gitlab.khronos.org/openxr/openxr/merge_requests/2858),
+    [internal MR 2916](https://gitlab.khronos.org/openxr/openxr/merge_requests/2916))
+  - New test: Add test for calling `xrAcquireSwapchainImage` multiple times without
+    calling `xrEndFrame`.
+    ([internal MR 2730](https://gitlab.khronos.org/openxr/openxr/merge_requests/2730))
+  - New test: Add additional tests for `XR_EXT_debug_utils` based on the test app
+    `loader_test`.
+    ([internal MR 2775](https://gitlab.khronos.org/openxr/openxr/merge_requests/2775))
+  - New test: Add checks for palm position and palm and wrist orientation to
+    `XR_EXT_hand_tracking` interactive tests.
+    ([internal MR 2798](https://gitlab.khronos.org/openxr/openxr/merge_requests/2798))
+  - New test: Add unbound action set to action sets test.
+    ([internal MR 2862](https://gitlab.khronos.org/openxr/openxr/merge_requests/2862),
+    [internal issue 2043](https://gitlab.khronos.org/openxr/openxr/issues/2043))
+  - New test: Add conformance test for calling `xrDestroyInstance` from a different
+    thread to `xrCreateInstance`, and `xrDestroySession` on a different thread to
+    `xrCreateSession`.
+    ([internal MR 2863](https://gitlab.khronos.org/openxr/openxr/merge_requests/2863))
+  - New test: Add interactive conformance test for infrequently updated swapchains.
+    ([internal MR 2873](https://gitlab.khronos.org/openxr/openxr/merge_requests/2873))
+  - New test: Add conformance tests for `xrCreateSession` failing, then passing
+    ([internal MR 2884](https://gitlab.khronos.org/openxr/openxr/merge_requests/2884))
+  - New test: Test `xrSyncActions` with no active action sets.
+    ([internal MR 2903](https://gitlab.khronos.org/openxr/openxr/merge_requests/2903))
+  - New test: Test calling `xrLocateSpace` with timestamps up to 1s old.
+    ([internal MR 2904](https://gitlab.khronos.org/openxr/openxr/merge_requests/2904))
+
 ## OpenXR CTS 1.0.27.0 (2023-05-10)
 
 This release contains a large number of new or improved tests. It is expected

CMakeLists.txt

@@ -33,6 +33,8 @@ set(LOADER_FOLDER "Loader")
 set(HELPER_FOLDER "Helpers")
 set(CODEGEN_FOLDER "Generated")
 set(TESTS_FOLDER "Tests")
+set(CONFORMANCE_TESTS_FOLDER "Conformance Test Suite")
+set(LOADER_TESTS_FOLDER "Loader Tests")
 set(API_LAYERS_FOLDER "Layers")
 set(SAMPLES_FOLDER "Samples")
 

LICENSES/Zlib.txt

@@ -0,0 +1,11 @@
+zlib License
+
+This software is provided 'as-is', without any express or implied warranty.  In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+     1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+     2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+     3. This notice may not be removed or altered from any source distribution.