Changes from OpenXR 1.1.47.

GitOrigin-RevId: dea45cd1e7203eda2e30bc02f8918075ca7dc61f

Author: rpavlik

.github/scripts/shared.py

@@ -9,7 +9,7 @@
 
 VS_VERSION = "Visual Studio 17 2022"
 
-PLATFORMS = ("Win32", "x64", "ARM64")  # "ARM",
+PLATFORMS = ("Win32", "x64", "ARM64")
 
 TRUE_FALSE = (True, False)
 

changes/conformance/mr.3675.gl.md

@@ -0,0 +1 @@
+- Fix: Account for "depends" of extensions in generated dependencies for automated availability tests

changes/conformance/mr.3683.gl.md

@@ -0,0 +1,4 @@
+---
+- issue.2435.gl
+---
+- Fix: Do not clamp max layers in MaxLayers-noninteractive test as we test submitting max+1 expecting failure. Use a fixed 4 swapchains to limit resource usage instead.

changes/conformance/mr.3705.gl.md

@@ -0,0 +1,5 @@
+---
+- mr.3705.gl
+- mr.3714.gl
+---
+New test: Add test cases for XrPose containing NaN.

changes/conformance/mr.3708.gl.md

@@ -0,0 +1,4 @@
+---
+- issue.2384.gl
+---
+New test: Validate that the `XrFovf` values returned from `xrLocateViews` are valid, plus warn if left == right or up == down are equal (0 FOV in either direction) as that is permitted but likely to lead to undefined behavior when applications compute their projection matrix.

changes/conformance/mr.3719.gl.md

@@ -0,0 +1 @@
+Improvement: Update Android target SDK version to 34 to eliminate Play Protect warning on install, and verify runtime can handle applications built with updated target SDK. (Minimum SDK remains 24.)

changes/conformance/mr.3726.gl.md

@@ -0,0 +1,2 @@
+- Fix: Changed interactive MaxLayer test to MinLayer test to more accurately reflect specification constraints.
+- Fix: Changed the MaxLayer-noninteractive test to emit a warning when failing to submit `maxLayer` layers, instead of an error.

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.46
+SPECREVISION = 1.1.47
 REVISION_COMPONENTS = $(subst ., ,$(SPECREVISION))
 MAJORMINORVER = $(word 1,$(REVISION_COMPONENTS)).$(word 2,$(REVISION_COMPONENTS))
 

specification/registry/xr.xml

@@ -40,6 +40,9 @@
 # TODO move permissions into XML eventually
 EXTRA_REFPAGES = (
     'org.khronos.openxr.permission.ext.HAND_TRACKING',
+
+    # Used by multiple XR_BD_spatial_* extensions
+    'com.picovr.permission.SPATIAL_DATA',
 )
 
 # These are marked with the code: macro

specification/scripts/check_spec_links.py

@@ -1112,6 +1112,9 @@ def markRequired(self, featurename, feature, required):
                 # We will eventually use these `interaction_profile_path`s but for the
                 # moment we just need them to exist so we can run schema validation.
                 pass
+            elif extendElem.get('interaction_profile_predicate'):
+                # These are processed separately.
+                pass
             else:
                 self.gen.logMsg('warn', 'extend type:', extendType, 'IS NOT SUPPORTED')
 
@@ -1127,6 +1130,7 @@ def getAlias(self, elem, dict):
             typeinfo = self.lookupElementInfo(name, dict)
             if not typeinfo:
                 self.gen.logMsg('error', name, 'is not a known name')
+                return None
             alias = typeinfo.elem.get('alias')
 
         return alias

specification/scripts/reg.py

@@ -552,7 +552,7 @@ def check_command_return_codes(self, name, type_info,
                                   "- none of these types:",
                                   required_types,
                                   "found in the set of referenced types",
-                                  referenced_types)
+                                  sorted(referenced_types))
 
     ###
     # Utility properties/methods

specification/scripts/spec_tools/consistency_tools.py

@@ -200,6 +200,10 @@ def __init__(self):
                 "Missing expected return code(s) XR_ERROR_HANDLE_INVALID,XR_ERROR_INSTANCE_LOST implied because of input of type XrInstance",
                 "Missing expected return code(s) XR_ERROR_INSTANCE_LOST,XR_ERROR_HANDLE_INVALID implied because of input of type XrInstance",
             ),
+            # Some derived structs use two-call idiom
+            "xrGetSpatialEntityComponentDataBD": (
+                "Unexpected return code XR_ERROR_SIZE_INSUFFICIENT - none of these types: {'uint32_t'} found in the set of referenced types ['XrSenseDataSnapshotBD', 'XrSpatialEntityComponentDataBaseHeaderBD', 'XrSpatialEntityComponentGetInfoBD', 'XrSpatialEntityComponentTypeBD', 'XrSpatialEntityIdBD', 'XrStructureType', 'void']",
+            ),
             # XrLoaderInterfaceStructs doesn't match the OpenXR pattern :(
             "XrLoaderInterfaceStructs": (
                 "Got an enum value whose name does not match the pattern: got XR_LOADER_INTERFACE_STRUCT_API_LAYER_CREATE_INFO but expected something that started with XR_LOADER_INTERFACE_STRUCTS_ due to typename being XrLoaderInterfaceStructs",

specification/scripts/xml_consistency.py

@@ -58,6 +58,7 @@ android {
         applicationId "org.khronos.openxr.cts"
         // for Vulkan, need at least 24
         minSdkVersion 24
+        targetSdkVersion 34
 
         versionName = project.versionOpenXR.toString() + project.versionQualifier
         versionCode = project.versionOpenXR.getVersionCode()

src/conformance/build.gradle

@@ -163,3 +163,14 @@ void ValidateXrVector3f(ConformanceHooksBase* conformanceHook, const XrVector3f&
                                             "%s is not a valid XrVector3f value: (%f, %f, %f)", valueName, v.x, v.y, v.z);
     }
 }
+
+void ValidateXrFovf(ConformanceHooksBase* conformanceHook, const XrFovf& fov, const char* valueName, const char* xrFunctionName)
+{
+    const float pi_2 = std::acos(0.0f);
+    auto isValidFov = [pi_2](float v) { return std::isfinite(v) && (-pi_2 < v && v < pi_2); };
+    if (!isValidFov(fov.angleLeft) || !isValidFov(fov.angleRight) || !isValidFov(fov.angleUp) || !isValidFov(fov.angleDown)) {
+        conformanceHook->ConformanceFailure(XR_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT, xrFunctionName,
+                                            "%s is not a valid XrFovf value: (%f, %f, %f, %f)", valueName, fov.angleLeft, fov.angleRight,
+                                            fov.angleUp, fov.angleDown);
+    }
+}

src/conformance/conformance_layer/RuntimeFailure.cpp

@@ -52,6 +52,7 @@ void ValidateFloat(ConformanceHooksBase* conformanceHook, float value, float min
 void ValidateXrTime(ConformanceHooksBase* conformanceHook, XrTime time, const char* valueName, const char* xrFunctionName);
 void ValidateXrQuaternion(ConformanceHooksBase* conformanceHook, const XrQuaternionf& q, const char* valueName, const char* xrFunctionName);
 void ValidateXrVector3f(ConformanceHooksBase* conformanceHook, const XrVector3f& v, const char* valueName, const char* xrFunctionName);
+void ValidateXrFovf(ConformanceHooksBase* conformanceHook, const XrFovf& fov, const char* valueName, const char* xrFunctionName);
 
 // clang-format off
 #define ENUM_CASE_BOOL(name, val) case name:
@@ -115,4 +116,5 @@ void ValidateXrEnum(ConformanceHooksBase* conformanceHook, TEnum value, const ch
 #define VALIDATE_XRTIME(value) ValidateXrTime(this, value, #value, __func__)
 #define VALIDATE_QUATERNION(value) ValidateXrQuaternion(this, value, #value, __func__)
 #define VALIDATE_VECTOR3F(value) ValidateXrVector3f(this, value, #value, __func__)
+#define VALIDATE_FOVF(value) ValidateXrFovf(this, value, #value, __func__)
 #define VALIDATE_XRENUM(value) ValidateXrEnum(this, value, #value, __func__)

src/conformance/conformance_layer/RuntimeFailure.h

@@ -270,7 +270,20 @@ XrResult ConformanceHooks::xrLocateViews(XrSession session, const XrViewLocateIn
                     VALIDATE_VECTOR3F(currentView.pose.position);
                 }
 
-                // TODO: Validate FOV.
+                VALIDATE_FOVF(currentView.fov);
+
+                if (currentView.fov.angleLeft == currentView.fov.angleRight) {
+                    POSSIBLE_NONCONFORMANT(
+                        "fov.angleLeft (%f) and fov.angleRight (%f) were equal."
+                        " This is legal, but applications without special handling for this may have trouble.",
+                        currentView.fov.angleLeft, currentView.fov.angleRight);
+                }
+                if (currentView.fov.angleUp == currentView.fov.angleDown) {
+                    POSSIBLE_NONCONFORMANT(
+                        "fov.angleUp (%f) and fov.angleDown (%f) were equal."
+                        " This is legal, but applications without special handling for this may have trouble.",
+                        currentView.fov.angleUp, currentView.fov.angleDown);
+                }
             }
         }
     }