feat(OpenXR) update to 1.0.25

MarkADom · Sep 18, 2022 · 9b42c4b · 9b42c4b
1 parent 087aa13
commit 9b42c4b
Show file tree

Hide file tree

Showing 54 changed files with 785 additions and 1,685 deletions.
diff --git a/doc/notes/3.3.2.md b/doc/notes/3.3.2.md
@@ -28,7 +28,7 @@ This build includes the following changes:
   * `GL_EXT_separate_depth_stencil`
   * `GL_EXT_shader_samples_identical`
 - OpenVR: Updated to 1.23.7 (up from 1.16.8)
-- OpenXR: Updated to 1.0.24 (up from 1.0.22)
+- OpenXR: Updated to 1.0.25 (up from 1.0.22)
 - Remotery: Updated to 1.2.1 (up from 1.0.0)
 - Shaderc: Updated to 2022.2 (up from 2022.1)
 - SPIRV-Cross: Updated to 0.49.0 (up from 0.48.0)

diff --git a/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/FBColorSpace.java b/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/FBColorSpace.java
@@ -19,7 +19,7 @@
 public class FBColorSpace {
 
     /** The extension specification version. */
-    public static final int XR_FB_color_space_SPEC_VERSION = 2;
+    public static final int XR_FB_color_space_SPEC_VERSION = 3;
 
     /** The extension name. */
     public static final String XR_FB_COLOR_SPACE_EXTENSION_NAME = "XR_FB_color_space";

diff --git a/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/FBHandTrackingMesh.java b/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/FBHandTrackingMesh.java
@@ -14,7 +14,7 @@
 public class FBHandTrackingMesh {
 
     /** The extension specification version. */
-    public static final int XR_FB_hand_tracking_mesh_SPEC_VERSION = 2;
+    public static final int XR_FB_hand_tracking_mesh_SPEC_VERSION = 3;
 
     /** The extension name. */
     public static final String XR_FB_HAND_TRACKING_MESH_EXTENSION_NAME = "XR_FB_hand_tracking_mesh";

diff --git a/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/FBPassthrough.java b/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/FBPassthrough.java
@@ -17,7 +17,7 @@
 public class FBPassthrough {
 
     /** The extension specification version. */
-    public static final int XR_FB_passthrough_SPEC_VERSION = 2;
+    public static final int XR_FB_passthrough_SPEC_VERSION = 3;
 
     /** The extension name. */
     public static final String XR_FB_PASSTHROUGH_EXTENSION_NAME = "XR_FB_passthrough";
@@ -34,6 +34,7 @@ public class FBPassthrough {
      * <li>{@link #XR_TYPE_COMPOSITION_LAYER_PASSTHROUGH_FB TYPE_COMPOSITION_LAYER_PASSTHROUGH_FB}</li>
      * <li>{@link #XR_TYPE_GEOMETRY_INSTANCE_CREATE_INFO_FB TYPE_GEOMETRY_INSTANCE_CREATE_INFO_FB}</li>
      * <li>{@link #XR_TYPE_GEOMETRY_INSTANCE_TRANSFORM_FB TYPE_GEOMETRY_INSTANCE_TRANSFORM_FB}</li>
+     * <li>{@link #XR_TYPE_SYSTEM_PASSTHROUGH_PROPERTIES2_FB TYPE_SYSTEM_PASSTHROUGH_PROPERTIES2_FB}</li>
      * <li>{@link #XR_TYPE_PASSTHROUGH_STYLE_FB TYPE_PASSTHROUGH_STYLE_FB}</li>
      * <li>{@link #XR_TYPE_PASSTHROUGH_COLOR_MAP_MONO_TO_RGBA_FB TYPE_PASSTHROUGH_COLOR_MAP_MONO_TO_RGBA_FB}</li>
      * <li>{@link #XR_TYPE_PASSTHROUGH_COLOR_MAP_MONO_TO_MONO_FB TYPE_PASSTHROUGH_COLOR_MAP_MONO_TO_MONO_FB}</li>
@@ -48,6 +49,7 @@ public class FBPassthrough {
         XR_TYPE_COMPOSITION_LAYER_PASSTHROUGH_FB              = 1000118003,
         XR_TYPE_GEOMETRY_INSTANCE_CREATE_INFO_FB              = 1000118004,
         XR_TYPE_GEOMETRY_INSTANCE_TRANSFORM_FB                = 1000118005,
+        XR_TYPE_SYSTEM_PASSTHROUGH_PROPERTIES2_FB             = 1000118006,
         XR_TYPE_PASSTHROUGH_STYLE_FB                          = 1000118020,
         XR_TYPE_PASSTHROUGH_COLOR_MAP_MONO_TO_RGBA_FB         = 1000118021,
         XR_TYPE_PASSTHROUGH_COLOR_MAP_MONO_TO_MONO_FB         = 1000118022,
@@ -95,8 +97,35 @@ public class FBPassthrough {
         XR_OBJECT_TYPE_PASSTHROUGH_LAYER_FB = 1000118002,
         XR_OBJECT_TYPE_GEOMETRY_INSTANCE_FB = 1000118004;
 
-    /** XrPassthroughFlagBitsFB */
-    public static final int XR_PASSTHROUGH_IS_RUNNING_AT_CREATION_BIT_FB = 0x1;
+    /**
+     * XrPassthroughCapabilityFlagBitsFB
+     * 
+     * <h5>Enum values:</h5>
+     * 
+     * <ul>
+     * <li>{@link #XR_PASSTHROUGH_CAPABILITY_BIT_FB PASSTHROUGH_CAPABILITY_BIT_FB}</li>
+     * <li>{@link #XR_PASSTHROUGH_CAPABILITY_COLOR_BIT_FB PASSTHROUGH_CAPABILITY_COLOR_BIT_FB}</li>
+     * <li>{@link #XR_PASSTHROUGH_CAPABILITY_LAYER_DEPTH_BIT_FB PASSTHROUGH_CAPABILITY_LAYER_DEPTH_BIT_FB}</li>
+     * </ul>
+     */
+    public static final int
+        XR_PASSTHROUGH_CAPABILITY_BIT_FB             = 0x1,
+        XR_PASSTHROUGH_CAPABILITY_COLOR_BIT_FB       = 0x2,
+        XR_PASSTHROUGH_CAPABILITY_LAYER_DEPTH_BIT_FB = 0x4;
+
+    /**
+     * XrPassthroughFlagBitsFB
+     * 
+     * <h5>Enum values:</h5>
+     * 
+     * <ul>
+     * <li>{@link #XR_PASSTHROUGH_IS_RUNNING_AT_CREATION_BIT_FB PASSTHROUGH_IS_RUNNING_AT_CREATION_BIT_FB}</li>
+     * <li>{@link #XR_PASSTHROUGH_LAYER_DEPTH_BIT_FB PASSTHROUGH_LAYER_DEPTH_BIT_FB}</li>
+     * </ul>
+     */
+    public static final int
+        XR_PASSTHROUGH_IS_RUNNING_AT_CREATION_BIT_FB = 0x1,
+        XR_PASSTHROUGH_LAYER_DEPTH_BIT_FB            = 0x2;
 
     /**
      * XrPassthroughLayerPurposeFB - Layer purpose

diff --git a/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/FBRenderModel.java b/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/FBRenderModel.java
@@ -19,7 +19,7 @@
 public class FBRenderModel {
 
     /** The extension specification version. */
-    public static final int XR_FB_render_model_SPEC_VERSION = 2;
+    public static final int XR_FB_render_model_SPEC_VERSION = 3;
 
     /** The extension name. */
     public static final String XR_FB_RENDER_MODEL_EXTENSION_NAME = "XR_FB_render_model";

diff --git a/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/KHROpenGLESEnable.java b/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/KHROpenGLESEnable.java
diff --git a/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/MLMl2ControllerInteraction.java b/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/MLMl2ControllerInteraction.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright LWJGL. All rights reserved.
+ * License terms: https://www.lwjgl.org/license
+ * MACHINE GENERATED FILE, DO NOT EDIT
+ */
+package org.lwjgl.openxr;
+
+/** The ML_ml2_controller_interaction extension. */
+public final class MLMl2ControllerInteraction {
+
+    /** The extension specification version. */
+    public static final int XR_ML_ml2_controller_interaction_SPEC_VERSION = 1;
+
+    /** The extension name. */
+    public static final String XR_ML_ML2_CONTROLLER_INTERACTION_EXTENSION_NAME = "XR_ML_ml2_controller_interaction";
+
+    private MLMl2ControllerInteraction() {}
+
+}
diff --git a/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/MSFTSceneUnderstanding.java b/modules/lwjgl/openxr/src/generated/java/org/lwjgl/openxr/MSFTSceneUnderstanding.java
@@ -21,7 +21,7 @@
 public class MSFTSceneUnderstanding {
 
     /** The extension specification version. */
-    public static final int XR_MSFT_scene_understanding_SPEC_VERSION = 1;
+    public static final int XR_MSFT_scene_understanding_SPEC_VERSION = 2;
 
     /** The extension name. */
     public static final String XR_MSFT_SCENE_UNDERSTANDING_EXTENSION_NAME = "XR_MSFT_scene_understanding";
@@ -537,6 +537,7 @@ public static int nxrCreateSceneMSFT(XrSceneObserverMSFT sceneObserver, long cre
      * <li>{@link XR10#XR_ERROR_SESSION_LOST ERROR_SESSION_LOST}</li>
      * <li>{@link XR10#XR_ERROR_OUT_OF_MEMORY ERROR_OUT_OF_MEMORY}</li>
      * <li>{@link XR10#XR_ERROR_LIMIT_REACHED ERROR_LIMIT_REACHED}</li>
+     * <li>{@link #XR_ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT}</li>
      * </ul></dd>
      * </dl>
      * 
@@ -735,7 +736,10 @@ public static int nxrComputeNewSceneMSFT(XrSceneObserverMSFT sceneObserver, long
      * <li>{@link XR10#XR_ERROR_SESSION_LOST ERROR_SESSION_LOST}</li>
      * <li>{@link XR10#XR_ERROR_OUT_OF_MEMORY ERROR_OUT_OF_MEMORY}</li>
      * <li>{@link XR10#XR_ERROR_TIME_INVALID ERROR_TIME_INVALID}</li>
+     * <li>{@link #XR_ERROR_SCENE_COMPUTE_FEATURE_INCOMPATIBLE_MSFT ERROR_SCENE_COMPUTE_FEATURE_INCOMPATIBLE_MSFT}</li>
+     * <li>{@link #XR_ERROR_SCENE_COMPUTE_CONSISTENCY_MISMATCH_MSFT ERROR_SCENE_COMPUTE_CONSISTENCY_MISMATCH_MSFT}</li>
      * <li>{@link XR10#XR_ERROR_POSE_INVALID ERROR_POSE_INVALID}</li>
+     * <li>{@link #XR_ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT}</li>
      * </ul></dd>
      * </dl>
      * 
@@ -870,6 +874,7 @@ public static int nxrGetSceneComponentsMSFT(XrSceneMSFT scene, long getInfo, lon
      * <li>{@link XR10#XR_ERROR_SESSION_LOST ERROR_SESSION_LOST}</li>
      * <li>{@link XR10#XR_ERROR_OUT_OF_MEMORY ERROR_OUT_OF_MEMORY}</li>
      * <li>{@link XR10#XR_ERROR_SIZE_INSUFFICIENT ERROR_SIZE_INSUFFICIENT}</li>
+     * <li>{@link #XR_ERROR_SCENE_COMPONENT_TYPE_MISMATCH_MSFT ERROR_SCENE_COMPONENT_TYPE_MISMATCH_MSFT}</li>
      * </ul></dd>
      * </dl>
      * 
@@ -1033,6 +1038,7 @@ public static int nxrGetSceneMeshBuffersMSFT(XrSceneMSFT scene, long getInfo, lo
      * <li>{@link XR10#XR_ERROR_INSTANCE_LOST ERROR_INSTANCE_LOST}</li>
      * <li>{@link XR10#XR_ERROR_SESSION_LOST ERROR_SESSION_LOST}</li>
      * <li>{@link XR10#XR_ERROR_OUT_OF_MEMORY ERROR_OUT_OF_MEMORY}</li>
+     * <li>{@link #XR_ERROR_SCENE_MESH_BUFFER_ID_INVALID_MSFT ERROR_SCENE_MESH_BUFFER_ID_INVALID_MSFT}</li>
      * <li>{@link #XR_ERROR_SCENE_COMPONENT_ID_INVALID_MSFT ERROR_SCENE_COMPONENT_ID_INVALID_MSFT}</li>
      * </ul></dd>
      * </dl>

diff --git a/...lwjgl/openxr/src/generated/java/org/lwjgl/openxr/MSFTSceneUnderstandingSerialization.java b/...lwjgl/openxr/src/generated/java/org/lwjgl/openxr/MSFTSceneUnderstandingSerialization.java
@@ -19,7 +19,7 @@
 public class MSFTSceneUnderstandingSerialization {
 
     /** The extension specification version. */
-    public static final int XR_MSFT_scene_understanding_serialization_SPEC_VERSION = 1;
+    public static final int XR_MSFT_scene_understanding_serialization_SPEC_VERSION = 2;
 
     /** The extension name. */
     public static final String XR_MSFT_SCENE_UNDERSTANDING_SERIALIZATION_EXTENSION_NAME = "XR_MSFT_scene_understanding_serialization";
@@ -75,6 +75,8 @@ public static int nxrDeserializeSceneMSFT(XrSceneObserverMSFT sceneObserver, lon
      * 
      * <p>The {@link #xrDeserializeSceneMSFT DeserializeSceneMSFT} function begins deserializing a list of serialized scene fragments. The runtime <b>must</b> return quickly without waiting for the deserialization to complete. The application <b>should</b> use {@link MSFTSceneUnderstanding#xrGetSceneComputeStateMSFT GetSceneComputeStateMSFT} to inspect the completeness of the deserialization.</p>
      * 
+     * <p>The runtime <b>must</b> return {@link MSFTSceneUnderstanding#XR_ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT} if {@link #xrDeserializeSceneMSFT DeserializeSceneMSFT} is called while the scene computation is in progress.</p>
+     * 
      * <p>The {@link MSFTSceneUnderstanding#xrGetSceneComputeStateMSFT GetSceneComputeStateMSFT} function <b>must</b> return {@link MSFTSceneUnderstanding#XR_SCENE_COMPUTE_STATE_UPDATING_MSFT SCENE_COMPUTE_STATE_UPDATING_MSFT} while the deserialization is in progress, and {@link MSFTSceneUnderstanding#XR_SCENE_COMPUTE_STATE_COMPLETED_MSFT SCENE_COMPUTE_STATE_COMPLETED_MSFT} when the deserialization has completed successfully. If the runtime fails to deserialize the binary stream, {@link MSFTSceneUnderstanding#xrGetSceneComputeStateMSFT GetSceneComputeStateMSFT} <b>must</b> return {@link MSFTSceneUnderstanding#XR_SCENE_COMPUTE_STATE_COMPLETED_WITH_ERROR_MSFT SCENE_COMPUTE_STATE_COMPLETED_WITH_ERROR_MSFT} to indicate that the deserialization has completed but an error occurred.</p>
      * 
      * <p>When {@link MSFTSceneUnderstanding#xrGetSceneComputeStateMSFT GetSceneComputeStateMSFT} returns {@link MSFTSceneUnderstanding#XR_SCENE_COMPUTE_STATE_COMPLETED_MSFT SCENE_COMPUTE_STATE_COMPLETED_MSFT}, the application <b>may</b> call {@link MSFTSceneUnderstanding#xrCreateSceneMSFT CreateSceneMSFT} to create the {@code XrSceneMSFT} handle. If {@link MSFTSceneUnderstanding#xrCreateSceneMSFT CreateSceneMSFT} is called while {@link MSFTSceneUnderstanding#xrGetSceneComputeStateMSFT GetSceneComputeStateMSFT} returns {@link MSFTSceneUnderstanding#XR_SCENE_COMPUTE_STATE_COMPLETED_WITH_ERROR_MSFT SCENE_COMPUTE_STATE_COMPLETED_WITH_ERROR_MSFT}, a valid {@code XrSceneMSFT} handle <b>must</b> be returned, but that handle <b>must</b> contain zero scene components.</p>
@@ -104,6 +106,7 @@ public static int nxrDeserializeSceneMSFT(XrSceneObserverMSFT sceneObserver, lon
      * <li>{@link XR10#XR_ERROR_INSTANCE_LOST ERROR_INSTANCE_LOST}</li>
      * <li>{@link XR10#XR_ERROR_SESSION_LOST ERROR_SESSION_LOST}</li>
      * <li>{@link XR10#XR_ERROR_OUT_OF_MEMORY ERROR_OUT_OF_MEMORY}</li>
+     * <li>{@link MSFTSceneUnderstanding#XR_ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT}</li>
      * </ul></dd>
      * </dl>
      * 
@@ -183,6 +186,7 @@ public static int nxrGetSerializedSceneFragmentDataMSFT(XrSceneMSFT scene, long
      * <li>{@link XR10#XR_ERROR_SESSION_LOST ERROR_SESSION_LOST}</li>
      * <li>{@link XR10#XR_ERROR_OUT_OF_MEMORY ERROR_OUT_OF_MEMORY}</li>
      * <li>{@link XR10#XR_ERROR_SIZE_INSUFFICIENT ERROR_SIZE_INSUFFICIENT}</li>
+     * <li>{@link MSFTSceneUnderstanding#XR_ERROR_SCENE_COMPONENT_ID_INVALID_MSFT ERROR_SCENE_COMPONENT_ID_INVALID_MSFT}</li>
      * </ul></dd>
      * </dl>
      *