Merge branch 'devel' into approved

KhronosGroup · Jan 18, 2024 · ffffcc4 · ffffcc4
2 parents 3354087 + e50152f
commit ffffcc4
Show file tree

Hide file tree

Showing 499 changed files with 2,861 additions and 1,913 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, The Khronos Group Inc.
+# Copyright (c) 2022-2024, 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-2023, The Khronos Group Inc. Inc.
+# Copyright 2021-2024, The Khronos Group Inc. Inc.
 #
 # SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.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-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, 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-2023 The Khronos Group Inc.
+# Copyright (c) 2019-2024, 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-2023 The Khronos Group Inc.
+# Copyright (c) 2019-2024, 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-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 import json

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-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, 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-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,24 @@
+# Copyright 2017-2024, The Khronos Group Inc.
+#
+# SPDX-License-Identifier: CC-BY-4.0
+#
+# See mailmap docs: https://git-scm.com/docs/gitmailmap
+# Please keep in sorted order.
+# Generally, only add lines, unless you want to change the spelling
+# of your name.
+# Test by running git shortlog -s -e
+#
+# This mailmap is for **public repos** and should only be tested there.
+
+Blake Taylor <[email protected]>
+Bryce Hutchings <[email protected]>
+Bryce Hutchings <[email protected]> <[email protected]>
+Bryce Hutchings <[email protected]> <[email protected]>
+Khronos Group Web Services <[email protected]>
+Khronos Group Web Services <[email protected]> <[email protected]>
+Rylie Pavlik <[email protected]>
+Rylie Pavlik <[email protected]> <[email protected]>
+Rylie Pavlik <[email protected]> <[email protected]>
+Yin Li <[email protected]>
+utzcoz <[email protected]>
+utzcoz <[email protected]> <[email protected]>
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-2023, The Khronos Group Inc.
+Copyright (c) 2020-2024, The Khronos Group Inc.
 
 SPDX-License-Identifier: CC0-1.0
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OpenXR
-Upstream-Contact: Ryan Pavlik <openxr-speceditor AT khronos DOT org>
+Upstream-Contact: Rylie Pavlik <openxr-speceditor AT khronos DOT org>
 Source: https://registry.khronos.org/OpenXR/
 
 Files: changes/conformance/*
@@ -10,11 +10,11 @@ Files: changes/conformance/*
        changes/README.md
        changes/template.md
        HOTFIX
-Copyright: 2019-2023, The Khronos Group Inc.
+Copyright: 2019-2024, The Khronos Group Inc.
 License: CC-BY-4.0
 
 Files: specification/config/copyright-spec.adoc
-Copyright: 2014-2023 The Khronos Group Inc
+Copyright: 2014-2024, The Khronos Group Inc
 License: LicenseRef-KhronosSpecCopyright-WithNormativeWording-v10
 
 Files: src/tests/hello_xr/android_resources/vulkan/mipmap-xxhdpi/ic_helloxr_launcher.png
@@ -27,7 +27,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-2023, The Khronos Group Inc.
+Copyright: Copyright (c) 2020-2024, The Khronos Group Inc.
   Copyright (c) 2020, Google
 License: Apache-2.0
 Comment: Based on a Material Icons asset ("emoji-people") with added text
@@ -86,7 +86,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-2023, The Khronos Group Inc.
+Copyright: 2017-2024, The Khronos Group Inc.
 License: CC-BY-4.0
 Comment: In-line license comments requested, https://gitlab.khronos.org/openxr/openxr/-/issues/1419
 
@@ -95,13 +95,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-2023, The Khronos Group Inc.
+Copyright: 2020-2024, 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-2023, The Khronos Group Inc.
+Copyright: 2022-2024, 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-2023, The Khronos Group Inc.
+Copyright (c) 2014-2024, 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-2023, The Khronos Group Inc.
+Copyright (c) 2020-2024, The Khronos Group Inc.
 
 SPDX-License-Identifier: CC-BY-4.0
 -->
@@ -17,6 +17,55 @@ 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.33.0 (2024-01-18)
+
+- Conformance Tests
+  - Fix: Refactor Pbr::Model into an immutable Pbr::Model and Pbr::Instance that
+    holds the state for one drawn instance of the model. This corrects the known
+    issue in the self-tests mentioned in a previous changelog.
+    ([internal MR 3079](https://gitlab.khronos.org/openxr/openxr/merge_requests/3079),
+    [internal issue 2139](https://gitlab.khronos.org/openxr/openxr/issues/2139),
+    [internal MR 3141](https://gitlab.khronos.org/openxr/openxr/merge_requests/3141))
+  - Fix: Avoid artificial error precedence requirement in test for
+    `XR_ERROR_GRAPHICS_DEVICE_INVALID`, by making sure to call the "check graphics
+    requirements" function if applicable.
+    ([internal MR 3093](https://gitlab.khronos.org/openxr/openxr/merge_requests/3093),
+    [internal issue 2155](https://gitlab.khronos.org/openxr/openxr/issues/2155))
+  - Fix: Remove extra `xrSyncActions` call in `test_glTFRendering` to resolve
+    interaction issue.
+    ([internal MR 3107](https://gitlab.khronos.org/openxr/openxr/merge_requests/3107),
+    [internal issue 2163](https://gitlab.khronos.org/openxr/openxr/issues/2163))
+  - Fix: Skip `XR_MSFT_controller_model` interactive test if extension is not
+    supported.
+    ([internal MR 3146](https://gitlab.khronos.org/openxr/openxr/merge_requests/3146),
+    [internal issue 2187](https://gitlab.khronos.org/openxr/openxr/issues/2187))
+  - Improvement: Adjust `StringToPath` utility function to be easier to use.
+    ([internal MR 2076](https://gitlab.khronos.org/openxr/openxr/merge_requests/2076))
+  - Improvement: Simplify how some tests refer to the main OpenXR handles.
+    ([internal MR 3023](https://gitlab.khronos.org/openxr/openxr/merge_requests/3023))
+  - Improvement: Make `AutoBasicSession` use `EventReader` to support event
+    multiplexing.
+    ([internal MR 3023](https://gitlab.khronos.org/openxr/openxr/merge_requests/3023))
+  - Improvement: Do not require system support for `XR_EXT_eye_gaze_interaction`
+    before running XrPath and interaction profile related tests. Paths are valid as
+    long as the extension is offered and enabled, regardless of whether there is
+    system support for eye tracking.
+    ([internal MR 3055](https://gitlab.khronos.org/openxr/openxr/merge_requests/3055))
+  - Improvement: General code cleanup, warning fixes, clang-tidy fixes, and
+    refactoring to improve flexibility and maintainability.
+    ([internal MR 3082](https://gitlab.khronos.org/openxr/openxr/merge_requests/3082),
+    [internal MR 3023](https://gitlab.khronos.org/openxr/openxr/merge_requests/3023))
+  - Improvement: On Android, log using the "FATAL" severity before triggering an
+    abort from the conformance layer.
+    ([internal MR 3087](https://gitlab.khronos.org/openxr/openxr/merge_requests/3087))
+  - Improvement: Exclude loader negotiation functions (added to XML and ratified
+    spec in 1.0.33) from the list of functions automatically tested by the
+    conformance suite.
+    ([internal MR 3113](https://gitlab.khronos.org/openxr/openxr/merge_requests/3113))
+  - New test: Check behavior for actions created without subaction paths, but
+    queried using subaction paths.
+    ([internal MR 3068](https://gitlab.khronos.org/openxr/openxr/merge_requests/3068))
+
 ## OpenXR CTS 1.0.32.1 (2023-12-14)
 
 A notable change in this release, is that the build system now checks for git

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

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,6 +1,6 @@
 
 <!--
-Copyright (c) 2014-2023, The Khronos Group Inc.
+Copyright (c) 2014-2024, 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-2023, The Khronos Group Inc.
+// Copyright (c) 2020-2024, The Khronos Group Inc.
 //
 // SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/HOTFIX b/HOTFIX
diff --git a/LICENSES/LicenseRef-KhronosSpecCopyright-WithNormativeWording-v10.txt b/LICENSES/LicenseRef-KhronosSpecCopyright-WithNormativeWording-v10.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2023, The Khronos Group Inc.
+Copyright (c) 2017-2024, 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
@@ -2,7 +2,7 @@ OpenXR Conformance Test Suite
 =============================
 
 <!--
-Copyright (c) 2019-2023, The Khronos Group Inc.
+Copyright (c) 2019-2024, 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-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, 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-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, 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-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/include/generated_header_list.txt b/include/generated_header_list.txt
@@ -1,4 +1,5 @@
 openxr.h
+openxr_loader_negotiation.h
 openxr_platform.h
 openxr_reflection.h
 openxr_reflection_structs.h

diff --git a/include/generated_header_list.txt.license b/include/generated_header_list.txt.license
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2023, The Khronos Group Inc.
+Copyright (c) 2017-2024, 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-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, 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-2023, The Khronos Group Inc.
+** Copyright (c) 2017-2024, 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-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -39,6 +39,10 @@ TARNAME=OpenXR-CTS
 makeSubset "$TARNAME" $(getConformanceFilenames)
 (
     cd github
+
+    # Add the shared public .mailmap used in all GitHub projects derived from the internal openxr repo
+    add_to_tar "$TARNAME" .mailmap
+
     # Add the shared COPYING.adoc used in all GitHub projects derived from the internal openxr repo
     add_to_tar "$TARNAME" COPYING.adoc
 

diff --git a/maintainer-scripts/common.sh b/maintainer-scripts/common.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2019-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, 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-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, 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-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/specification/.gitignore b/specification/.gitignore
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -12,6 +12,7 @@ diffs/
 # Artifacts from converting/checking RELAX-NG Compact schema.
 registry/registry.rng
 registry/regenerated.rnc
+registry/regenerated.rnc.backup
 
 # Schematron-related files
 registry/schxslt-cli.jar