Merge branch 'devel' into approved

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

@@ -22,9 +22,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: true
+          fetch-tags: "${{ inputs.gradleTask != 'assembleRelease' }}"
+          fetch-depth: "${{ github.event.release && '0' || '1'}}"
 
       - name: Get modern CMake and Ninja
-        uses: lukka/[email protected].2
+        uses: lukka/[email protected].3
 
       - name: set up JDK 11
         uses: actions/setup-java@v4

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

@@ -19,7 +19,7 @@ jobs:
           lfs: true
 
       - name: Get modern CMake and Ninja
-        uses: lukka/[email protected].2
+        uses: lukka/[email protected].3
 
       - name: set up JDK 11
         uses: actions/setup-java@v4

.github/workflows/check_clang_format_and_codespell.yml

@@ -10,7 +10,7 @@ jobs:
   clang-format:
     runs-on: ubuntu-latest
     container:
-      image: khronosgroup/docker-images:openxr.20240805@sha256:05e900737234daf09d29a1c525a017ea8cc54a0d1f808569488e9ae6018053f2
+      image: khronosgroup/docker-images:openxr.20240924@sha256:3d595e68d21b2bba12cb7bbfa8cb135f66a2d9b97efeda6de3c6c8412163c4b7
 
     steps:
       - uses: actions/checkout@v4

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

@@ -1,4 +1,4 @@
-# Copyright 2021-2023, Collabora, Ltd.
+# Copyright 2021-2024, Collabora, Ltd.
 # SPDX-License-Identifier: CC0-1.0
 
 on:
@@ -32,9 +32,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: true
+          fetch-tags: "${{ !github.event.release }}"
+          fetch-depth: "${{ github.event.release && '0' || '1'}}"
 
       - name: Get modern CMake and Ninja
-        uses: lukka/[email protected].2
+        uses: lukka/[email protected].3
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v2

.mailmap

@@ -11,6 +11,7 @@
 # This mailmap is for **public repos** and should only be tested there.
 
 Blake Taylor <[email protected]>
+Bradley Austin Davis <[email protected]>
 Bryce Hutchings <[email protected]>
 Bryce Hutchings <[email protected]> <[email protected]>
 Bryce Hutchings <[email protected]> <[email protected]>

.reuse/dep5

@@ -63,6 +63,16 @@ Copyright: 2011 by Morten S. Mikkelsen
 License: Zlib
 Comment: Unmodified, vendored copy of MikkTSpace commit 3e895b4
 
+Files: src/external/basis_universal/*
+Copyright: 2019-2021 Binomial LLC
+License: Apache-2.0
+Comment: Unmodified, vendored subset of basis_universal commit 1.16.4
+
+Files: src/external/basis_universal/zstd/*
+Copyright: 2016-2021, Yann Collet, Facebook, Inc.
+License: BSD-3-Clause
+Comment: Vendored copy of single-file libraries included in the basis_universal repo.
+
 Files: src/external/jnipp/*
 Copyright: 2016-2020, Mitchell Dowd
   2020, Collabora, Ltd.

BUILDING.md

@@ -155,7 +155,16 @@ cd build/macos
 cmake -G "Xcode" ../..
 ```
 
-Finally, open the build/macos/OPENXR.xcodeproj in Xcode to build the samples.
+Finally, open the `build/macos/OPENXR.xcodeproj` in Xcode to build the samples.
+
+If you want to build on the command line, you can run the following command to
+check available targets and built `ALL_BUILD` target as example:
+
+```shell
+# In build/macos directory
+xcodebuild -list -project OPENXR.xcodeproj/
+xcodebuild -scheme ALL_BUILD build
+```
 
 ### Android
 

CHANGELOG.CTS.md

@@ -17,6 +17,102 @@ 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.1.41.0 (2024-10-10)
+
+An important feature of this release is the new usage guide for the Conformance
+Test Suite. The instructions for running the suite are now in that guide, rather
+than in the README. Approved releases will contain HTML and PDF artifacts
+generated from this usage guide. Additionally, the AsciiDoc sources and Makefile
+are also included in the CTS source tree, under `src/conformance/usage`.
+
+- Conformance Tests
+  - Addition: Document the assumptions about the testing environment in a
+    centralized location in the "Usage" document.
+    ([internal MR 3325](https://gitlab.khronos.org/openxr/openxr/merge_requests/3325))
+  - Fix: Resolve D3D12 command list leak.
+    ([internal MR 3387](https://gitlab.khronos.org/openxr/openxr/merge_requests/3387),
+    [internal issue 2298](https://gitlab.khronos.org/openxr/openxr/issues/2298))
+  - Fix: Do not apply ambient occlusion to direct lighting in PBR shader, per the
+    glTF specification.
+    ([internal MR 3419](https://gitlab.khronos.org/openxr/openxr/merge_requests/3419))
+  - Fix: Avoid crashes/errors when running in a headless mode.
+    ([internal MR 3446](https://gitlab.khronos.org/openxr/openxr/merge_requests/3446))
+  - Fix: Resolve some thread races in the conformance layer as identified by TSAN.
+    ([internal MR 3477](https://gitlab.khronos.org/openxr/openxr/merge_requests/3477))
+  - Fix: Add support for `XR_KHR_maintenance1` to the `GripSurface-objective` test.
+    ([internal MR 3478](https://gitlab.khronos.org/openxr/openxr/merge_requests/3478))
+  - Fix: Typo in subtest name in multithreading test.
+    ([internal MR 3479](https://gitlab.khronos.org/openxr/openxr/merge_requests/3479))
+  - Fix: `IsViewConfigurationTypeEnumValid` needs to check for `XR_VERSION_1_1`
+    when validating for
+    `XR_VIEW_CONFIGURATION_TYPE_PRIMARY_STEREO_WITH_FOVEATED_INSET`
+    ([internal MR 3492](https://gitlab.khronos.org/openxr/openxr/merge_requests/3492))
+  - Fix: Remove checks for `input/aim_activate_ext/value` which check more than the
+    specification allows. This value can be bool or float but the tests required
+    float values.
+    ([internal MR 3508](https://gitlab.khronos.org/openxr/openxr/merge_requests/3508),
+    [internal issue 2368](https://gitlab.khronos.org/openxr/openxr/issues/2368))
+  - Fix: Correct typo causing incorrect matrix to be used when rendering on OpenGL
+    ([internal MR 3509](https://gitlab.khronos.org/openxr/openxr/merge_requests/3509))
+  - Fix: Correct generated interaction tests through corrected XML description of
+    OpenXR 1.1 related additions to the promoted Meta Touch Plus, Touch Pro, and
+    Touch (Rift CV1) controller interaction profiles.
+    ([internal MR 3513](https://gitlab.khronos.org/openxr/openxr/merge_requests/3513),
+    [internal issue 2350](https://gitlab.khronos.org/openxr/openxr/issues/2350),
+    [internal issue 2375](https://gitlab.khronos.org/openxr/openxr/issues/2375))
+  - Fix: Ensure that the correct `XrViewConfigurationType` is used in the
+    `xrLocateViews` call.
+    ([internal MR 3519](https://gitlab.khronos.org/openxr/openxr/merge_requests/3519))
+  - Improvement: Move detailed usage documentation from README to a separate
+    "Usage" AsciiDoc book.
+    ([internal MR 3325](https://gitlab.khronos.org/openxr/openxr/merge_requests/3325))
+  - Improvement: Support KTX2 compressed textures in glTF files using basis
+    universal, transcoding to GPU supported compressed textures where possible.
+    ([internal MR 3394](https://gitlab.khronos.org/openxr/openxr/merge_requests/3394),
+    [internal issue 2105](https://gitlab.khronos.org/openxr/openxr/issues/2105),
+    [internal MR 3510](https://gitlab.khronos.org/openxr/openxr/merge_requests/3510),
+    [internal MR 3522](https://gitlab.khronos.org/openxr/openxr/merge_requests/3522),
+    [internal MR 3532](https://gitlab.khronos.org/openxr/openxr/merge_requests/3532))
+  - Improvement: Split up glTF model loading, to allow the first stage to be
+    asynchronous on the CPU.
+    ([internal MR 3395](https://gitlab.khronos.org/openxr/openxr/merge_requests/3395))
+  - Improvement: In the glTF self-test, show a spinner while waiting for
+    (pathological) models to load in a background thread.
+    ([internal MR 3395](https://gitlab.khronos.org/openxr/openxr/merge_requests/3395))
+  - Improvement: Add `ApproxEqual` functions to `xr_math_operators.h`, and `Approx`
+    wrappers in `xr_math_approx.h`, to fix equality checks in the CTS.
+    ([internal MR 3437](https://gitlab.khronos.org/openxr/openxr/merge_requests/3437),
+    [internal MR 3485](https://gitlab.khronos.org/openxr/openxr/merge_requests/3485),
+    [internal MR 3480](https://gitlab.khronos.org/openxr/openxr/merge_requests/3480))
+  - Improvement: Update codebase to use struct initialization convention for
+    clarity.
+    ([internal MR 3445](https://gitlab.khronos.org/openxr/openxr/merge_requests/3445))
+  - Improvement: Clarify/add (for consistency) some WARN messages in the CTS.
+    ([internal MR 3447](https://gitlab.khronos.org/openxr/openxr/merge_requests/3447))
+  - Improvement: Remove confusing return value only used by dead code after a
+    `FAIL`.
+    ([internal MR 3467](https://gitlab.khronos.org/openxr/openxr/merge_requests/3467))
+  - Improvement: Skip waiting for human input when using
+    `XR_EXT_conformance_automation` to make the tests run faster.
+    ([internal MR 3471](https://gitlab.khronos.org/openxr/openxr/merge_requests/3471))
+  - Improvement: Refactor the d-pad extension test to fix issues and make it more
+    consistent with other tests.
+    ([internal MR 3474](https://gitlab.khronos.org/openxr/openxr/merge_requests/3474))
+  - Improvement: Add quaternion output support.
+    ([internal MR 3480](https://gitlab.khronos.org/openxr/openxr/merge_requests/3480))
+  - Improvement: Remove usage of deprecated `std::is_pod` in CTS.
+    ([internal MR 3483](https://gitlab.khronos.org/openxr/openxr/merge_requests/3483))
+  - Improvement: Allow `[composition]` tests to be rendered then skipped (with a
+    warning) after a timeout, for automation purposes.
+    ([internal MR 3487](https://gitlab.khronos.org/openxr/openxr/merge_requests/3487))
+  - Improvement: Warning fixes.
+    ([internal MR 3500](https://gitlab.khronos.org/openxr/openxr/merge_requests/3500))
+  - Improvement: Migrate CMake build system away from using
+    `find_package(PythonInterpreter)`, deprecated since CMake 3.12. Use
+    `find_package(Python3 COMPONENTS Interpreter)` instead.
+    ([OpenXR-SDK-Source PR 486](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/486),
+    [internal MR 3472](https://gitlab.khronos.org/openxr/openxr/merge_requests/3472))
+
 ## OpenXR CTS 1.1.40.0 (2024-08-29)
 
 - Conformance Tests

CMakeLists.txt

@@ -21,7 +21,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(OPENXR)
 
-find_package(PythonInterp 3)
+find_package(Python3 COMPONENTS Interpreter)
 include(CTest)
 
 # Enable IDE GUI folders.  "Helper targets" that don't have interesting source code should set their FOLDER property to this
@@ -44,7 +44,7 @@ option(
     OFF
 )
 
-if(BUILD_FORCE_GENERATION AND NOT PYTHON_EXECUTABLE)
+if(BUILD_FORCE_GENERATION AND NOT Python3_EXECUTABLE)
     message(FATAL_ERROR "BUILD_FORCE_GENERATION requires Python")
 endif()
 

COPYING.adoc

@@ -6,7 +6,7 @@
 
 This document is shared across a number of OpenXR GitHub projects, as the
 set of files in those projects is partially overlapping.
-(There is a single "source of truth" internal Khronos GitLab repo these
+(There is a single "source of truth" internal Khronos GitLab monorepo these
 GitHub repositories interact with.)
 
 == Licenses
@@ -17,7 +17,7 @@ https://reuse.software/spec/[REUSE 3.0 specification] with clear copyright
 holders and license identifier listed for each file, preferably in each
 file.
 Where this is not possible, or e.g. when we are using files unmodified from
-other open-source projects, license data is listed:
+other open source projects, license data is listed:
 
 * in an adjacent file of the same name, with the additional extension
   "`.license`"