Changes from OpenXR 1.1.40.

GitOrigin-RevId: 3ec99b59aaf8ac8d7c8d822ddd174fc6c0c5e57b

.github/workflows/gradle-wrapper-validation.yml

@@ -19,4 +19,4 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: true
-      - uses: gradle/actions/wrapper-validation@v3
+      - uses: gradle/actions/wrapper-validation@v4

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

@@ -34,7 +34,7 @@ jobs:
           lfs: true
 
       - name: Get modern CMake and Ninja
-        uses: lukka/get-cmake@v3.29.5
+        uses: lukka/get-cmake@v3.30.1
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v2

.gitignore

@@ -41,6 +41,7 @@ specification/scripts/.cache
 
 # VS 2019 CMake artifacts
 out/build/
+out/install/
 
 # VS misc
 *.sln

.reuse/dep5

@@ -69,6 +69,11 @@ Copyright: 2016-2020, Mitchell Dowd
 License: MIT
 Comment: Unmodified, vendored copy of commit e6c415837c5a487809fdbb2f71f1080d454eb99a
 
+Files: src/external/metal-cpp/*
+Copyright: Copyright 2020-2022 Apple Inc.
+License: Apache-2.0
+Comment: Unmodified, vendored copy of metal-cpp_macOS13_iOS16.zip
+
 Files: external/python/jinja2/*
   external/python/Jinja2-2.11.3.dist-info/*
 Copyright: 2013-2019 by the Jinja team

README.md

@@ -65,6 +65,7 @@ as it is important for interpreting the results.
         conformance_cli "exclude:[interactive]" -G vulkan --apiVersion 1.0 --reporter ctsxml::out=automated_vulkan_1_0.xml
         conformance_cli "exclude:[interactive]" -G vulkan2 --apiVersion 1.0 --reporter ctsxml::out=automated_vulkan2_1_0.xml
         conformance_cli "exclude:[interactive]" -G opengl --apiVersion 1.0 --reporter ctsxml::out=automated_opengl_1_0.xml
+        conformance_cli "exclude:[interactive]" -G metal --apiVersion 1.0 --reporter ctsxml::out=automated_metal_1_0.xml
 
     Example for OpenXR 1.1:
 
@@ -73,6 +74,7 @@ as it is important for interpreting the results.
         conformance_cli "exclude:[interactive]" -G vulkan --apiVersion 1.1 --reporter ctsxml::out=automated_vulkan_1_1.xml
         conformance_cli "exclude:[interactive]" -G vulkan2 --apiVersion 1.1 --reporter ctsxml::out=automated_vulkan2_1_1.xml
         conformance_cli "exclude:[interactive]" -G opengl --apiVersion 1.1 --reporter ctsxml::out=automated_opengl_1_1.xml
+        conformance_cli "exclude:[interactive]" -G metal --apiVersion 1.1 --reporter ctsxml::out=automated_metal_1_1.xml
 
     Notes:
     * Some tests require that a begun session progresses to `XR_SESSION_STATE_FOCUSED`.
@@ -90,6 +92,7 @@ as it is important for interpreting the results.
         conformance_cli "[composition][interactive]" -G vulkan --apiVersion 1.0 --reporter ctsxml::out=interactive_composition_vulkan_1_0.xml
         conformance_cli "[composition][interactive]" -G vulkan2 --apiVersion 1.0 --reporter ctsxml::out=interactive_composition_vulkan2_1_0.xml
         conformance_cli "[composition][interactive]" -G opengl --apiVersion 1.0 --reporter ctsxml::out=interactive_composition_opengl_1_0.xml
+        conformance_cli "[composition][interactive]" -G metal --apiVersion 1.0 --reporter ctsxml::out=interactive_composition_metal_1_0.xml
 
     Example for OpenXR 1.1:
 
@@ -98,6 +101,7 @@ as it is important for interpreting the results.
         conformance_cli "[composition][interactive]" -G vulkan --apiVersion 1.1 --reporter ctsxml::out=interactive_composition_vulkan_1_1.xml
         conformance_cli "[composition][interactive]" -G vulkan2 --apiVersion 1.1 --reporter ctsxml::out=interactive_composition_vulkan2_1_1.xml
         conformance_cli "[composition][interactive]" -G opengl --apiVersion 1.1 --reporter ctsxml::out=interactive_composition_opengl_1_1.xml
+        conformance_cli "[composition][interactive]" -G metal --apiVersion 1.1 --reporter ctsxml::out=interactive_composition_metal_1_1.xml
 
     Notes:
     * The runtime must support `khr/simple_controller` to manually pass or fail
@@ -273,6 +277,7 @@ To run the self-tests, commands similar to the following can be used:
         conformance_cli "[self_test][interactive]" -G vulkan --apiVersion 1.0 --reporter ctsxml::out=interactive_self_test_vulkan_1_0.xml
         conformance_cli "[self_test][interactive]" -G vulkan2 --apiVersion 1.0 --reporter ctsxml::out=interactive_self_test_vulkan2_1_0.xml
         conformance_cli "[self_test][interactive]" -G opengl --apiVersion 1.0 --reporter ctsxml::out=interactive_self_test_opengl_1_0.xml
+        conformance_cli "[self_test][interactive]" -G metal --apiVersion 1.0 --reporter ctsxml::out=interactive_self_test_metal_1_0.xml
 
     Example for OpenXR 1.1:
 
@@ -281,6 +286,7 @@ To run the self-tests, commands similar to the following can be used:
         conformance_cli "[self_test][interactive]" -G vulkan --apiVersion 1.1 --reporter ctsxml::out=interactive_self_test_vulkan_1_1.xml
         conformance_cli "[self_test][interactive]" -G vulkan2 --apiVersion 1.1 --reporter ctsxml::out=interactive_self_test_vulkan2_1_1.xml
         conformance_cli "[self_test][interactive]" -G opengl --apiVersion 1.1 --reporter ctsxml::out=interactive_self_test_opengl_1_1.xml
+        conformance_cli "[self_test][interactive]" -G metal --apiVersion 1.1 --reporter ctsxml::out=interactive_self_test_metal_1_1.xml
 
 Conformance Submission Package Requirements
 -------------------------------------------
@@ -301,12 +307,14 @@ Details:
 
         automated_d3d11_1_0.xml
         automated_d3d12_1_0.xml
+        automated_metal_1_0.xml
         automated_opengl_1_0.xml
         automated_gles_1_0.xml
         automated_vulkan_1_0.xml
         automated_vulkan2_1_0.xml
         automated_d3d11_1_1.xml
         automated_d3d12_1_1.xml
+        automated_metal_1_1.xml
         automated_opengl_1_1.xml
         automated_gles_1_1.xml
         automated_vulkan_1_1.xml
@@ -317,12 +325,14 @@ Details:
 
         interactive_composition_d3d11_1_0.xml
         interactive_composition_d3d12_1_0.xml
+        interactive_composition_metal_1_0.xml
         interactive_composition_opengl_1_0.xml
         interactive_composition_gles_1_0.xml
         interactive_composition_vulkan_1_0.xml
         interactive_composition_vulkan2_1_0.xml
         interactive_composition_d3d11_1_1.xml
         interactive_composition_d3d12_1_1.xml
+        interactive_composition_metal_1_1.xml
         interactive_composition_opengl_1_1.xml
         interactive_composition_gles_1_1.xml
         interactive_composition_vulkan_1_1.xml

changes/conformance/mr.3009.gl.md

@@ -0,0 +1 @@
+Improvement: Supply Metal graphics plugin for running conformance test on macOS with `XR_KHR_metal_enable` extension.

changes/conformance/mr.3256.gl.md

@@ -0,0 +1,4 @@
+---
+- issue.1609.gl
+---
+New test: Check that an action with no suggested bindings is not bound/active.

changes/conformance/mr.3282.gl.md

@@ -0,0 +1 @@
+Improvement: Verify more two-call-idiom outputs in the conformance layer.

changes/conformance/mr.3283.gl.md

@@ -0,0 +1 @@
+Improvement: Update CTS layer to verify that all enumerations of reference spaces contain LOCAL_FLOOR if they are required to.

changes/conformance/mr.3287.gl.md

@@ -0,0 +1,6 @@
+---
+- issue.2170
+- issue.2301
+---
+- Improvement: Optionally verify that the runtime validates struct `.type` member in various places.
+- Fix: Ensure that existing tests for `type` member verification only run when selected, and only test that member as invalid.

changes/conformance/mr.3331.gl.md

@@ -0,0 +1,4 @@
+---
+- issue.2259.gl
+---
+Improvement: Simplify grip surface (palm pose) test and support conformance automation extension in it, among other improvements to it.

changes/conformance/mr.3336.gl.md

@@ -0,0 +1 @@
+Improvement: Clean up usage of RAII mutex lock guards.

changes/conformance/mr.3349.gl.md

@@ -0,0 +1,5 @@
+---
+- mr.3349.gl
+- mr.3431.gl
+---
+Improvement: Add `xr_math_operators.h` to unify C++ math wrappers for CTS.

changes/conformance/mr.3386.gl.md

@@ -0,0 +1 @@
+Fix: Swapchain leak in test helper.

changes/conformance/mr.3422.gl.md

@@ -0,0 +1 @@
+Improvement: Specify names through the debug extension for more Vulkan objects, for improved ease of debugging.

changes/conformance/mr.3427.gl.md

@@ -0,0 +1 @@
+Improvement: Add basic SNORM formats to table of runtime-supported formats testable on OpenGL.

maintainer-scripts/common.sh

@@ -208,6 +208,8 @@ getSDKSourceFilenames() {
         src/external/android-jni-wrappers \
         src/external/jnipp \
         src/external/jsoncpp \
+        src/external/catch2 \
+        src/external/metal-cpp \
         src/loader \
         src/scripts \
         src/tests \

specification/Makefile

@@ -39,7 +39,7 @@ endif
 VERSIONS := XR_VERSION_1_0 XR_VERSION_1_1 XR_LOADER_VERSION_1_0
 VERSIONOPTIONS := $(foreach version,$(VERSIONS),-feature $(version))
 
-SPECREVISION = 1.1.38
+SPECREVISION = 1.1.40
 REVISION_COMPONENTS = $(subst ., ,$(SPECREVISION))
 MAJORMINORVER = $(word 1,$(REVISION_COMPONENTS)).$(word 2,$(REVISION_COMPONENTS))