Changes from OpenXR 1.0.33

GitOrigin-RevId: a561c5898b72f59965790790a28bbc3b7e9bcf13
KhronosGroup · Jan 4, 2024 · 1234a8d · 1234a8d
1 parent a140881
commit 1234a8d
Show file tree

Hide file tree

Showing 497 changed files with 1,578 additions and 911 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
 -->

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/changes/conformance/mr.3023.gl.md b/changes/conformance/mr.3023.gl.md
@@ -0,0 +1,3 @@
+- Improvement: Simplify how some tests refer to the main OpenXR handles.
+- Improvement: Make `AutoBasicSession` use `EventReader` to support event multiplexing.
+- Improvement: Miscellaneous code cleanups and refactoring to improve flexibility and maintainability.
diff --git a/changes/conformance/mr.3087.gl.md b/changes/conformance/mr.3087.gl.md
@@ -0,0 +1 @@
+Improvement: On Android, log using the "FATAL" severity before triggering an abort from the conformance layer.
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

diff --git a/specification/Makefile b/specification/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2013-2023 The Khronos Group Inc.
+# Copyright 2013-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -32,7 +32,7 @@ ifneq (,$(strip $(VERY_STRICT)))
 ASCIIDOC := $(ASCIIDOC) --failure-level WARN
 endif
 
-SPECREVISION = 1.0.32
+SPECREVISION = 1.0.33
 REVISION_COMPONENTS = $(subst ., ,$(SPECREVISION))
 MAJORMINORVER = $(word 1,$(REVISION_COMPONENTS)).$(word 2,$(REVISION_COMPONENTS))
 
@@ -133,10 +133,11 @@ config_stamp:
 HEADER_DIR    := $(OUTDIR)/openxr
 HEADER	      := $(HEADER_DIR)/openxr.h
 PLATHEAD      := $(HEADER_DIR)/openxr_platform.h
+LOADERHEAD    := $(HEADER_DIR)/openxr_loader_negotiation.h
 REFLECTHEADERS:= $(HEADER_DIR)/openxr_reflection.h \
                  $(HEADER_DIR)/openxr_reflection_structs.h \
                  $(HEADER_DIR)/openxr_reflection_parent_structs.h
-GENHEADERS    := $(HEADER) $(PLATHEAD) $(REFLECTHEADERS)
+GENHEADERS    := $(HEADER) $(PLATHEAD) $(LOADERHEAD) $(REFLECTHEADERS)
 DEFINESHEAD   := $(HEADER_DIR)/openxr_platform_defines.h
 
 # Platform header (just copy)
@@ -535,7 +536,7 @@ CHECK_MARKUP_SCRIPT = $(CURDIR)/checkMarkup
 # Edit the following line's "ignore_count" when the number of checkSpecLinks errors changes,
 # either by reducing (ensuring we keep the improvement)
 # or by increasing (if there's an error we can't resolve right now and don't want to break CI)
-CHECK_SPEC_LINKS_SCRIPT = $(CURDIR)/scripts/check_spec_links.py --ignore_count=0 -Wall --include_warn
+CHECK_SPEC_LINKS_SCRIPT = $(CURDIR)/scripts/check_spec_links.py --ignore_count=0 -Wall --include_warn -Werror
 # -Werror disabled for now because there are ~14 -Wrefpage_missing messages.
 # Would like those in the logs, but not in the count for build-breaking.
 
@@ -631,7 +632,7 @@ clean_generated:
 
 # Clean generated targets as well as intermediates.
 clean clobber: clean_dirt clean_generated
-	$(RM) $(HEADER) $(PLATHEAD) $(REFLECTHEADERS) $(DEFINESHEAD) $(HTMLSPEC) $(PDFSPEC) $(PDFA4SPEC) $(STYLEGUIDE) $(LOADERGUIDE) $(CONFIG_STAMP_FN)
+	$(RM) $(HEADER) $(PLATHEAD) $(LOADERHEAD) $(REFLECTHEADERS) $(DEFINESHEAD) $(HTMLSPEC) $(PDFSPEC) $(PDFA4SPEC) $(STYLEGUIDE) $(LOADERGUIDE) $(CONFIG_STAMP_FN)
 	# Clean up extracted code
 	if [ -f $(EXAMPLES_MAKEFILE) ]; then $(MAKE) -f $(EXAMPLES_MAKEFILE) clean-examples; fi
 	$(RM) $(EXAMPLES_MAKEFILE)

diff --git a/specification/README.md b/specification/README.md
@@ -1,7 +1,7 @@
 # Building the OpenXR Specification
 
 <!--
-Copyright 2014-2023 The Khronos Group Inc.
+Copyright 2014-2024, The Khronos Group Inc.
 
 SPDX-License-Identifier: CC-BY-4.0
 -->
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Improvement: On Android, log using the "FATAL" severity before triggering an abort from the conformance layer.