Changes from OpenXR 1.0.29

GitOrigin-RevId: 07acb644ae0a5a42f891120d3172004cb5605ad7
KhronosGroup · Aug 25, 2023 · d3797bd · d3797bd
1 parent ad7859d
commit d3797bd
Show file tree

Hide file tree

Showing 83 changed files with 3,492 additions and 1,508 deletions.
diff --git a/.azure-pipelines/shared/generate_windows_matrix_build.py b/.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

diff --git a/.azure-pipelines/shared/install_vulkan.ps1 b/.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) {

diff --git a/.azure-pipelines/shared/organize_windows_artifacts.py b/.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

diff --git a/.azure-pipelines/shared/print_windows_artifact_names.py b/.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

diff --git a/.azure-pipelines/shared/shared.py b/.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

diff --git a/.git-blame-ignore-revs b/.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
 

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

diff --git a/.github/scripts/shared.py b/.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

diff --git a/.gitignore b/.gitignore
@@ -54,6 +54,7 @@ local.properties
 
 # Don't ignore these things
 !.*.license
+!.artifact-bot.md
 !.appveyor.yml
 !.azure-pipelines/
 !.azure-pipelines/nuget/NugetTemplate/build

diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -3,7 +3,12 @@ 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
@@ -30,25 +35,22 @@ 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/*
-Copyright: 2017 Syoyo Fujita, Aurélien Chatelain and many contributors
+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/tinygltf/json.hpp
-Copyright: 2013-2017 Niels Lohmann <http://nlohmann.me>
-License: MIT
-Comment: Unmodified, included in tiny-gltf repo.
-
 Files: src/external/d3dx12/*
 Copyright: Copyright (c) Microsoft Corporation.
 License: MIT
@@ -82,11 +84,6 @@ 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-2023, The Khronos Group Inc.

diff --git a/HOTFIX b/HOTFIX
diff --git a/changes/conformance/mr.2387.gl.md b/changes/conformance/mr.2387.gl.md
@@ -0,0 +1,4 @@
+---
+- mr.2858.gl
+---
+New test: Verify two-call idiom behavior of `XR_MSFT_controller_model` as well as handling of invalid model keys.
diff --git a/changes/conformance/mr.2672.gl.md b/changes/conformance/mr.2672.gl.md
@@ -0,0 +1 @@
+Improvement: Add non-interactive test for XR_EXT_palm_pose vendor extension.
diff --git a/changes/conformance/mr.2685.gl.md b/changes/conformance/mr.2685.gl.md
@@ -0,0 +1,4 @@
+---
+- issue.1978.gl
+---
+Improvement: Refactor and standardize creation of swapchain image format tables, fixing some Vulkan invalid usage.
diff --git a/changes/conformance/mr.2704.gl.md b/changes/conformance/mr.2704.gl.md
@@ -2,5 +2,6 @@
 - mr.2784.gl
 - mr.2785.gl
 - mr.2808.gl
+- mr.2809.gl
 ---
 Improvement: Cleanup and code quality work.
diff --git a/changes/conformance/mr.2729.gl.md b/changes/conformance/mr.2729.gl.md
@@ -1 +1,5 @@
+---
+- mr.2795.gl
+- mr.2858.gl
+---
 Improvement: Add joint query to non-interactive test for `XR_EXT_hand_tracking`.
diff --git a/changes/conformance/mr.2737.gl.md b/changes/conformance/mr.2737.gl.md
@@ -1 +1,4 @@
+---
+- issue.1932.gl
+---
 Improvement: Migrate more tests to use the `SKIP` macro when appropriate.
diff --git a/changes/conformance/mr.2756.gl.md b/changes/conformance/mr.2756.gl.md
@@ -1 +1,4 @@
+---
+- issue.1387.gl
+---
 Fix: Do not use Catch2 assertion macros in graphics plugin methods that may be called before the first test case execution begins.
diff --git a/changes/conformance/mr.2766.gl.md b/changes/conformance/mr.2766.gl.md
@@ -1 +1 @@
-Fix spelling.
+Fix: spelling.
diff --git a/changes/conformance/mr.2775.gl.md b/changes/conformance/mr.2775.gl.md
@@ -0,0 +1 @@
+Improvement: Add additional tests for XR_EXT_debug_utils based on the test app loader_test.
diff --git a/changes/conformance/mr.2850.gl.md b/changes/conformance/mr.2850.gl.md
@@ -0,0 +1 @@
+Fix building CTS with mingw compiler.
diff --git a/maintainer-scripts/common.sh b/maintainer-scripts/common.sh
@@ -34,7 +34,7 @@ makeSubset() {
 
 }
 
-COMMON_FILES=".gitignore .gitattributes .git-blame-ignore-revs CODE_OF_CONDUCT.md LICENSES .reuse .editorconfig"
+COMMON_FILES=".gitignore .gitattributes .git-blame-ignore-revs CODE_OF_CONDUCT.md LICENSES .reuse .editorconfig HOTFIX"
 export COMMON_FILES
 COMMON_EXCLUDE_PATTERN="KhronosExperimental"
 export COMMON_EXCLUDE_PATTERN

diff --git a/specification/Makefile b/specification/Makefile
@@ -32,7 +32,7 @@ ifneq (,$(strip $(VERY_STRICT)))
 ASCIIDOC := $(ASCIIDOC) --failure-level WARN
 endif
 
-SPECREVISION = 1.0.28
+SPECREVISION = 1.0.29
 REVISION_COMPONENTS = $(subst ., ,$(SPECREVISION))
 MAJORMINORVER = $(word 1,$(REVISION_COMPONENTS)).$(word 2,$(REVISION_COMPONENTS))
 
@@ -384,26 +384,14 @@ BACKEND_ARGS=--backend html5
 $(ASCIIDOCTOR_TARGETS):
 	$(ECHO) "[asciidoctor] $(SPECSRC) -> $(call MAKE_RELATIVE,$@)"
 	$(QUIET)$(MKDIR) "$(@D)"
-	$(QUIET)if [ $$(uname -s | cut -c 1-6) == "CYGWIN" ]; then \
-	OUTSPEC_DOS=$$(cygpath -w $@) ;\
-	SPECSRC_DOS=$$(cygpath -w $(SPECSRC)) ;\
-	ATTRIBOPTS_DOS='$(ATTRIBOPTS)' ;\
-	ADOCOPTS_DOS="--doctype book -a data-uri -r $$(cygpath -w $(CURDIR)/scripts/spec-macros.rb) $$ATTRIBOPTS_DOS" ;\
-	BATCH_FILE=$$(cygpath -w $$(mktemp)).bat ;\
-	echo $(ASCIIDOC) $$ADOCOPTS_DOS $(BACKEND_ARGS) --out-file $$OUTSPEC_DOS $$SPECSRC_DOS > $$BATCH_FILE ;\
-	CMD /C $$BATCH_FILE ;\
-	rm -f $$BATCH_FILE ;\
-	else \
-	$(ASCIIDOC) $(ADOCOPTS) $(BACKEND_ARGS) --out-file $@ $(SPECSRC) 2>&1 | tee $(LOGFILE) ;\
-	if [ -s $(LOGFILE) ]; then \
+	$(QUIET)$(ASCIIDOC) $(ADOCOPTS) $(BACKEND_ARGS) --out-file $@ $(SPECSRC) 2>&1 | tee $(LOGFILE)
+	$(QUIET)if [ -s $(LOGFILE) ]; then \
 		echo "Failure: $(LOGFILE) exists and is not empty!"; \
 		false; \
 	else \
 		rm $(LOGFILE); \
-	fi; \
 	fi
 	$(POSTPROCESS)
-# TODO: Postprocess step(s) may have broken the Cygwin build. Not sure this matters anymore with WSL, though.
 
 
 ################################################
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Improvement: Add non-interactive test for XR_EXT_palm_pose vendor extension.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Improvement: Add additional tests for XR_EXT_debug_utils based on the test app loader_test.