Merge branch 'devel' into approved

KhronosGroup · Feb 19, 2025 · 37a6e33 · 37a6e33
2 parents 9184488 + 2137246
commit 37a6e33
Show file tree

Hide file tree

Showing 593 changed files with 3,797 additions and 1,792 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2024, The Khronos Group Inc.
+# Copyright (c) 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024, The Khronos Group Inc.
+# Copyright (c) 2022-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,4 +1,4 @@
-# Copyright 2021-2024, The Khronos Group Inc.
+# Copyright 2021-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2024, The Khronos Group Inc.
+# Copyright (c) 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.github/scripts/CMakePresets.json b/.github/scripts/CMakePresets.json
@@ -32,7 +32,7 @@
             "inherits": "win32",
             "cacheVariables": {
                 "CMAKE_SYSTEM_NAME": "WindowsStore",
-                "CMAKE_SYSTEM_VERSION": "10.0"
+                "CMAKE_SYSTEM_VERSION": "10.0.22000.0"
             }
         },
         {
@@ -45,7 +45,7 @@
             "inherits": "x64",
             "cacheVariables": {
                 "CMAKE_SYSTEM_NAME": "WindowsStore",
-                "CMAKE_SYSTEM_VERSION": "10.0"
+                "CMAKE_SYSTEM_VERSION": "10.0.22000.0"
             }
         },
         {
@@ -54,7 +54,7 @@
             "architecture": "ARM",
             "cacheVariables": {
                 "CMAKE_SYSTEM_NAME": "WindowsStore",
-                "CMAKE_SYSTEM_VERSION": "10.0"
+                "CMAKE_SYSTEM_VERSION": "10.0.22000.0"
             }
         },
         {
@@ -63,7 +63,7 @@
             "architecture": "ARM64",
             "cacheVariables": {
                 "CMAKE_SYSTEM_NAME": "WindowsStore",
-                "CMAKE_SYSTEM_VERSION": "10.0"
+                "CMAKE_SYSTEM_VERSION": "10.0.22000.0"
             }
         },
         {

diff --git a/.github/scripts/generate_windows_matrix_build.py b/.github/scripts/generate_windows_matrix_build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019-2024, The Khronos Group Inc.
+# Copyright (c) 2019-2025 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 from itertools import product

diff --git a/.github/scripts/install_vulkan.ps1 b/.github/scripts/install_vulkan.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, The Khronos Group Inc.
+# Copyright (c) 2019-2025 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 $ErrorActionPreference = 'Stop'

diff --git a/.github/scripts/organize_windows_artifacts.py b/.github/scripts/organize_windows_artifacts.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019-2024, The Khronos Group Inc.
+# Copyright (c) 2019-2025 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 from pathlib import Path

diff --git a/.github/scripts/shared.py b/.github/scripts/shared.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, The Khronos Group Inc.
+# Copyright (c) 2019-2025 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 import json
@@ -9,7 +9,7 @@
 
 VS_VERSION = "Visual Studio 17 2022"
 
-PLATFORMS = ("Win32", "x64", "ARM", "ARM64")
+PLATFORMS = ("Win32", "x64", "ARM64")  # "ARM",
 
 TRUE_FALSE = (True, False)
 

diff --git a/.github/workflows/check_clang_format_and_codespell.yml b/.github/workflows/check_clang_format_and_codespell.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, The Khronos Group Inc.
+# Copyright (c) 2019-2025 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 name: Check code formatting and spelling

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2024, The Khronos Group Inc.
+# Copyright (c) 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.mailmap b/.mailmap
@@ -1,4 +1,4 @@
-# Copyright 2017-2024, The Khronos Group Inc.
+# Copyright 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: CC-BY-4.0
 #

diff --git a/.proclamation.json.license b/.proclamation.json.license
@@ -1,4 +1,4 @@
 Copyright (c) 2020 Collabora, Ltd. and the Proclamation contributors
-Copyright (c) 2020-2024, The Khronos Group Inc.
+Copyright (c) 2020-2025 The Khronos Group Inc.
 
 SPDX-License-Identifier: CC0-1.0
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -11,11 +11,11 @@ Files: changes/conformance/*
        changes/README.md
        changes/template.md
        HOTFIX
-Copyright: 2019-2024, The Khronos Group Inc.
+Copyright: 2019-2025 The Khronos Group Inc.
 License: CC-BY-4.0
 
 Files: specification/config/copyright-spec.adoc
-Copyright: 2014-2024, The Khronos Group Inc
+Copyright: 2014-2025 The Khronos Group Inc
 License: LicenseRef-KhronosSpecCopyright-WithNormativeWording-v10
 
 Files: src/tests/hello_xr/android_resources/vulkan/mipmap-xxhdpi/ic_helloxr_launcher.png
@@ -28,7 +28,7 @@ Files: src/tests/hello_xr/android_resources/vulkan/mipmap-xxhdpi/ic_helloxr_laun
        src/tests/hello_xr/android_resources/opengles/mipmap-xhdpi/ic_helloxr_launcher.png
        src/tests/hello_xr/android_resources/opengles/mipmap-hdpi/ic_helloxr_launcher.png
        src/tests/hello_xr/android_resources/opengles/mipmap-xxxhdpi/ic_helloxr_launcher.png
-Copyright: Copyright (c) 2020-2024, The Khronos Group Inc.
+Copyright: Copyright (c) 2020-2025 The Khronos Group Inc.
   Copyright (c) 2020, Google
 License: Apache-2.0
 Comment: Based on a Material Icons asset ("emoji-people") with added text
@@ -107,7 +107,7 @@ Comment: In-line license comments requested, https://gitlab.khronos.org/openxr/o
 
 Files: specification/sources/chapters/extensions/ext/ext_performance_settings.adoc
   specification/sources/chapters/extensions/ext/ext_thermal_query.adoc
-Copyright: 2017-2024, The Khronos Group Inc.
+Copyright: 2017-2025 The Khronos Group Inc.
 License: CC-BY-4.0
 Comment: In-line license comments requested, https://gitlab.khronos.org/openxr/openxr/-/issues/1419
 
@@ -116,13 +116,13 @@ 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-2024, The Khronos Group Inc.
+Copyright: 2020-2025 The Khronos Group Inc.
   2020, Google
 License: Apache-2.0
 Comment: Generated .png versions of an icon, created in Android Studio
   based on a Material Icons asset.
 
 Files: specification/scripts/vuidCounts.py
-Copyright: 2022-2024, The Khronos Group Inc.
+Copyright: 2022-2025 The Khronos Group Inc.
 License: Apache-2.0
 Comment: File automatically rewritten by VUID assignment.
diff --git a/BUILDING.md b/BUILDING.md
@@ -1,7 +1,7 @@
 # How to Build and Run
 
 <!--
-Copyright (c) 2014-2024, The Khronos Group Inc.
+Copyright (c) 2014-2025 The Khronos Group Inc.
 
 SPDX-License-Identifier: CC-BY-4.0
 -->

diff --git a/CHANGELOG.CTS.md b/CHANGELOG.CTS.md
@@ -1,7 +1,7 @@
 # Changelog for OpenXR-CTS Repo
 
 <!--
-Copyright (c) 2020-2024, The Khronos Group Inc.
+Copyright (c) 2020-2025 The Khronos Group Inc.
 
 SPDX-License-Identifier: CC-BY-4.0
 -->
@@ -17,6 +17,80 @@ 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.45.0 (2025-02-13)
+
+- Conformance Tests
+  - Fix: Handling Android Intent extras with embedded commas.
+    ([internal MR 3630](https://gitlab.khronos.org/openxr/openxr/merge_requests/3630))
+  - Fix: Regression in `xrGetInstanceProcAddr` test when running on a 1.0 runtime
+    or in 1.0 mode.
+    ([internal MR 3656](https://gitlab.khronos.org/openxr/openxr/merge_requests/3656))
+  - Improvement: Code cleanup.
+    ([internal MR 3421](https://gitlab.khronos.org/openxr/openxr/merge_requests/3421),
+    [internal MR 3665](https://gitlab.khronos.org/openxr/openxr/merge_requests/3665),
+    [internal MR 3671](https://gitlab.khronos.org/openxr/openxr/merge_requests/3671))
+  - Improvement: Modify SubImage test to include a y offset test
+    ([internal MR 3428](https://gitlab.khronos.org/openxr/openxr/merge_requests/3428),
+    [internal issue 2312](https://gitlab.khronos.org/openxr/openxr/issues/2312))
+  - Improvement: Validate more action and action set names. Explicitly allow . and
+    .. as action set names.
+    ([internal MR 3466](https://gitlab.khronos.org/openxr/openxr/merge_requests/3466),
+    [internal issue 2315](https://gitlab.khronos.org/openxr/openxr/issues/2315),
+    [internal issue 2419](https://gitlab.khronos.org/openxr/openxr/issues/2419),
+    [internal MR 3652](https://gitlab.khronos.org/openxr/openxr/merge_requests/3652))
+  - Improvement: Adjust handling of disconnectable devices.
+    ([internal MR 3563](https://gitlab.khronos.org/openxr/openxr/merge_requests/3563))
+  - Improvement: Improve maintainability by separating `GlobalData` and `Options`
+    further, and migrate most argument parsing into `Options` directly.
+    ([internal MR 3563](https://gitlab.khronos.org/openxr/openxr/merge_requests/3563))
+  - Improvement: Tidy up test for `XR_EXT_eye_gaze_interaction` and correct
+    erroneous messages.
+    ([internal MR 3588](https://gitlab.khronos.org/openxr/openxr/merge_requests/3588))
+  - Improvement: Add warning for xrEnumerateSwapchainFormats returned formats being
+    in numerical order.
+    ([internal MR 3618](https://gitlab.khronos.org/openxr/openxr/merge_requests/3618))
+  - Improvement: Adds support for "enabledInstanceExtension" and
+    "interactionProfiles" intent values (lists).
+    ([internal MR 3630](https://gitlab.khronos.org/openxr/openxr/merge_requests/3630))
+  - Improvement: Add swapchain vector clear for consistency.
+    ([internal MR 3638](https://gitlab.khronos.org/openxr/openxr/merge_requests/3638))
+  - Improvement: Update Gradle from 7.5 to to 8.5, and Android Gradle Plugin to
+    8.1.4.
+    ([internal MR 3640](https://gitlab.khronos.org/openxr/openxr/merge_requests/3640))
+  - Improvement: Save more contextual data from hand tracking test, to ease
+    troubleshooting.
+    ([internal MR 3641](https://gitlab.khronos.org/openxr/openxr/merge_requests/3641))
+  - Improvement: Make invalid handle tests for actions match other similar tests.
+    ([internal MR 3643](https://gitlab.khronos.org/openxr/openxr/merge_requests/3643))
+  - Improvement: Add instructions for automated execution during development and
+    internal runtime testing.
+    ([internal MR 3644](https://gitlab.khronos.org/openxr/openxr/merge_requests/3644))
+  - Improvement: Code cleanup to improve consistency and maintainability.
+    ([internal MR 3645](https://gitlab.khronos.org/openxr/openxr/merge_requests/3645))
+  - Improvement: Clean up and slightly tighten test conditions for composition
+    layer tests.
+    ([internal MR 3646](https://gitlab.khronos.org/openxr/openxr/merge_requests/3646))
+  - Improvement: Clarify that **all tests** must pass for a runtime to be
+    considered conformant, not just those corresponding to core or KHR
+    functionality.
+    ([internal MR 3657](https://gitlab.khronos.org/openxr/openxr/merge_requests/3657))
+  - Improvement: Clarify output messages to emphasize that the listed "enabled
+    extensions" are the extensions enabled across all tests.
+    ([internal MR 3690](https://gitlab.khronos.org/openxr/openxr/merge_requests/3690))
+  - New test: Non-interactive test for `XR_EXT_frame_synthesis`
+    ([internal MR 2200](https://gitlab.khronos.org/openxr/openxr/merge_requests/2200))
+  - New test: Verify that runtimes handle edge cases around
+    `XrSystemGraphicsProperties::maxLayerCount` noninteractively, and interactively
+    verify that multiple projection and quad layers are rendered as expected.
+    ([internal MR 3400](https://gitlab.khronos.org/openxr/openxr/merge_requests/3400),
+    [internal MR 3655](https://gitlab.khronos.org/openxr/openxr/merge_requests/3655))
+  - New test: Add test which enables all graphics bindings extensions supported for
+    the runtime.
+    ([internal MR 3595](https://gitlab.khronos.org/openxr/openxr/merge_requests/3595),
+    [internal MR 3679](https://gitlab.khronos.org/openxr/openxr/merge_requests/3679))
+  - conformance: Add hint for 'git lfs fetch' for cmake
+    ([OpenXR-CTS PR 103](https://github.com/KhronosGroup/OpenXR-CTS/pull/103))
+
 ## OpenXR CTS 1.1.43.0 (2024-12-12)
 
 - Conformance Tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2024, The Khronos Group Inc.
+# Copyright (c) 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -176,16 +176,25 @@ if(BASH_COMMAND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/specification/Makefile")
 endif()
 
 if(ANDROID AND INSTALL_TO_ARCHITECTURE_PREFIXES)
+    set(LICENSE_DEST META-INF)
+else()
+    set(LICENSE_DEST share/doc/openxr)
+endif()
+
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
     install(
         FILES "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
-        DESTINATION META-INF
+        DESTINATION ${LICENSE_DEST}
         COMPONENT License
     )
-
-else()
+elseif(EXISTS "${CMAKE_SOURCE_DIR}/../../../../LICENSES/Apache-2.0.txt")
+    # Building from a sources jar, where we omit that single file
+    # to avoid confusion regarding the combination of licenses in the sources.
+    # But for consistency, we will put it in the binaries.
     install(
-        FILES "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
-        DESTINATION share/doc/openxr
+        FILES "${CMAKE_SOURCE_DIR}/../../../../LICENSES/Apache-2.0.txt"
+        RENAME LICENSE
+        DESTINATION ${LICENSE_DEST}
         COMPONENT License
     )
 endif()
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,6 +1,6 @@
 
 <!--
-Copyright (c) 2014-2024, The Khronos Group Inc.
+Copyright (c) 2014-2025 The Khronos Group Inc.
 
 SPDX-License-Identifier: CC-BY-4.0
 -->

diff --git a/COPYING.adoc b/COPYING.adoc
@@ -1,6 +1,6 @@
 = COPYING.adoc for the Khronos Group OpenXR projects
 
-// Copyright (c) 2020-2024, The Khronos Group Inc.
+// Copyright (c) 2020-2025 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/LICENSES/LicenseRef-KhronosSpecCopyright-WithNormativeWording-v10.txt b/LICENSES/LicenseRef-KhronosSpecCopyright-WithNormativeWording-v10.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2024, The Khronos Group Inc.
+Copyright (c) 2017-2025 The Khronos Group Inc.
 
 This Specification is protected by copyright laws and contains material
 proprietary to Khronos.

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # OpenXR™ Conformance Test Suite (OpenXR-CTS)
 
 <!--
-Copyright (c) 2019-2024, The Khronos Group Inc.
+Copyright (c) 2019-2025 The Khronos Group Inc.
 
 SPDX-License-Identifier: CC-BY-4.0
 -->

diff --git a/checkCodespell b/checkCodespell
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2019-2024, The Khronos Group Inc.
+# Copyright (c) 2019-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/external/include/CMakeLists.txt b/external/include/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2024, The Khronos Group Inc.
+# Copyright (c) 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2024, The Khronos Group Inc.
+# Copyright (c) 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/include/generated_header_list.txt.license b/include/generated_header_list.txt.license
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2024, The Khronos Group Inc.
+Copyright (c) 2017-2025 The Khronos Group Inc.
 
 SPDX-License-Identifier: Apache-2.0
 

diff --git a/include/openxr/CMakeLists.txt b/include/openxr/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2024, The Khronos Group Inc.
+# Copyright (c) 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/include/openxr/openxr_platform_defines.h b/include/openxr/openxr_platform_defines.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2017-2024, The Khronos Group Inc.
+** Copyright (c) 2017-2025 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0 OR MIT
 */

diff --git a/maintainer-scripts/archive-conformance.sh b/maintainer-scripts/archive-conformance.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2019-2024, The Khronos Group Inc.
+# Copyright (c) 2019-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/maintainer-scripts/common.sh b/maintainer-scripts/common.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2019-2024, The Khronos Group Inc.
+# Copyright (c) 2019-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/openxr-codespell.exclude b/openxr-codespell.exclude
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2024, The Khronos Group Inc.
+# Copyright (c) 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: CC-BY-4.0
 # Lines that should be excluded from codespell - trailing newline required!

diff --git a/runClangFormat.sh b/runClangFormat.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2017-2024, The Khronos Group Inc.
+# Copyright (c) 2017-2025 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #