Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update OpenXR-SDK to 1.0.31 #143

Merged
merged 1 commit into from
Nov 17, 2023
+330 −47
Merged

Update OpenXR-SDK to 1.0.31 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions generator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ impl Parser {
extensions: IndexMap::new(),
// TODO: Handle these extensions
disabled_exts: [
"XR_MSFT_scene_marker",
"XR_MSFT_scene_understanding",
"XR_MSFT_scene_understanding_serialization",
]
Expand Down
134 changes: 119 additions & 15 deletions openxr/src/generated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ pub use sys::{
DebugUtilsMessageTypeFlagsEXT, DigitalLensControlFlagsALMALENCE, EnvironmentBlendMode,
Extent2Df, Extent2Di, Extent3DfEXT, Extent3DfFB, ExternalCameraAttachedToDeviceOCULUS,
ExternalCameraExtrinsicsOCULUS, ExternalCameraIntrinsicsOCULUS,
ExternalCameraStatusFlagsOCULUS, EyeExpressionHTC, EyePositionFB, EyeVisibility,
FaceConfidenceFB, FaceExpressionFB, FaceExpressionSetFB, FacialTrackingTypeHTC,
ExternalCameraStatusFlagsOCULUS, EyeCalibrationStatusML, EyeExpressionHTC, EyePositionFB,
EyeVisibility, FaceConfidenceFB, FaceExpressionFB, FaceExpressionSetFB, FacialTrackingTypeHTC,
ForceFeedbackCurlApplyLocationMNDX, ForceFeedbackCurlLocationMNDX, FormFactor,
FoveationConfigurationHTC, FoveationDynamicFB, FoveationDynamicFlagsHTC,
FoveationEyeTrackedProfileCreateFlagsMETA, FoveationEyeTrackedStateFlagsMETA, FoveationLevelFB,
FoveationLevelHTC, FoveationModeHTC, Fovf, FrameEndInfoFlagsML,
GlobalDimmerFrameEndInfoFlagsML, HandEXT, HandForearmJointULTRALEAP, HandJointEXT,
HandJointLocationEXT, HandJointSetEXT, HandJointVelocityEXT, HandJointsMotionRangeEXT,
HandMeshVertexMSFT, HandPoseTypeMSFT, HandTrackingAimFlagsFB, HandTrackingDataSourceEXT,
InputSourceLocalizedNameFlags, InstanceCreateFlags, KeyboardTrackingFlagsFB,
KeyboardTrackingQueryFlagsFB, LipExpressionHTC, LocalDimmingModeMETA, MeshComputeLodMSFT,
ObjectType, Offset2Df, Offset2Di, Offset3DfFB, OverlayMainSessionFlagsEXTX,
HeadsetFitStatusML, InputSourceLocalizedNameFlags, InstanceCreateFlags,
KeyboardTrackingFlagsFB, KeyboardTrackingQueryFlagsFB, LipExpressionHTC, LocalDimmingModeMETA,
MeshComputeLodMSFT, ObjectType, Offset2Df, Offset2Di, Offset3DfFB, OverlayMainSessionFlagsEXTX,
OverlaySessionCreateFlagsEXTX, PassthroughCapabilityFlagsFB, PassthroughColorLutChannelsMETA,
PassthroughFlagsFB, PassthroughFormHTC, PassthroughLayerPurposeFB,
PassthroughPreferenceFlagsMETA, PassthroughStateChangedFlagsFB, PerfSettingsDomainEXT,
Expand All @@ -36,16 +36,17 @@ pub use sys::{
PlaneDetectorOrientationEXT, PlaneDetectorSemanticTypeEXT, Posef, Quaternionf, Rect2Df,
Rect2Di, Rect3DfFB, ReferenceSpaceType, RenderModelFlagsFB, ReprojectionModeMSFT,
SceneComponentTypeMSFT, SceneComputeConsistencyMSFT, SceneComputeFeatureMSFT,
SceneComputeStateMSFT, SceneObjectTypeMSFT, ScenePlaneAlignmentTypeMSFT,
SemanticLabelsSupportFlagsFB, SessionCreateFlags, SessionState, SpaceComponentTypeFB,
SpaceLocationFlags, SpacePersistenceModeFB, SpaceQueryActionFB, SpaceStorageLocationFB,
SpaceVelocityFlags, SpatialGraphNodeTypeMSFT, StructureType, SwapchainCreateFlags,
SwapchainCreateFoveationFlagsFB, SwapchainStateFoveationFlagsFB, SwapchainUsageFlags,
SystemGraphicsProperties, TrackingOptimizationSettingsDomainQCOM,
TrackingOptimizationSettingsHintQCOM, TriangleMeshFlagsFB, Vector2f, Vector3f, Vector4f,
Vector4sFB, ViewConfigurationType, ViewStateFlags, VirtualKeyboardInputSourceMETA,
VirtualKeyboardInputStateFlagsMETA, VirtualKeyboardLocationTypeMETA, VisibilityMaskTypeKHR,
VulkanDeviceCreateFlagsKHR, VulkanInstanceCreateFlagsKHR, WindingOrderFB,
SceneComputeStateMSFT, SceneMarkerQRCodeSymbolTypeMSFT, SceneMarkerTypeMSFT,
SceneObjectTypeMSFT, ScenePlaneAlignmentTypeMSFT, SemanticLabelsSupportFlagsFB,
SessionCreateFlags, SessionState, SpaceComponentTypeFB, SpaceLocationFlags,
SpacePersistenceModeFB, SpaceQueryActionFB, SpaceStorageLocationFB, SpaceVelocityFlags,
SpatialGraphNodeTypeMSFT, StructureType, SwapchainCreateFlags, SwapchainCreateFoveationFlagsFB,
SwapchainStateFoveationFlagsFB, SwapchainUsageFlags, SystemGraphicsProperties,
TrackingOptimizationSettingsDomainQCOM, TrackingOptimizationSettingsHintQCOM,
TriangleMeshFlagsFB, Vector2f, Vector3f, Vector4f, Vector4sFB, ViewConfigurationType,
ViewStateFlags, VirtualKeyboardInputSourceMETA, VirtualKeyboardInputStateFlagsMETA,
VirtualKeyboardLocationTypeMETA, VisibilityMaskTypeKHR, VulkanDeviceCreateFlagsKHR,
VulkanInstanceCreateFlagsKHR, WindingOrderFB,
};
#[doc = r" A subset of known extensions"]
#[derive(Debug, Clone, Eq, PartialEq, Default)]
Expand Down Expand Up @@ -166,6 +167,7 @@ pub struct ExtensionSet {
pub ml_frame_end_info: bool,
pub ml_global_dimmer: bool,
pub ml_compat: bool,
pub ml_user_calibration: bool,
pub mnd_headless: bool,
pub mnd_swapchain_usage_input_attachment_bit: bool,
pub msft_unbounded_reference_space: bool,
Expand Down Expand Up @@ -196,6 +198,7 @@ pub struct ExtensionSet {
pub varjo_environment_depth_estimation: bool,
pub varjo_marker_tracking: bool,
pub varjo_view_offset: bool,
pub yvr_controller_interaction: bool,
#[doc = r" Extensions unknown to the high-level bindings"]
pub other: Vec<String>,
}
Expand Down Expand Up @@ -529,6 +532,9 @@ impl ExtensionSet {
raw::CompatML::NAME => {
out.ml_compat = true;
}
raw::UserCalibrationML::NAME => {
out.ml_user_calibration = true;
}
raw::HeadlessMND::NAME => {
out.mnd_headless = true;
}
Expand Down Expand Up @@ -613,6 +619,9 @@ impl ExtensionSet {
raw::ViewOffsetVARJO::NAME => {
out.varjo_view_offset = true;
}
raw::ControllerInteractionYVR::NAME => {
out.yvr_controller_interaction = true;
}
bytes => {
if let Ok(name) = std::str::from_utf8(bytes) {
out.other.push(name.into());
Expand Down Expand Up @@ -1159,6 +1168,11 @@ impl ExtensionSet {
out.push(raw::CompatML::NAME.into());
}
}
{
if self.ml_user_calibration {
out.push(raw::UserCalibrationML::NAME.into());
}
}
{
if self.mnd_headless {
out.push(raw::HeadlessMND::NAME.into());
Expand Down Expand Up @@ -1297,6 +1311,11 @@ impl ExtensionSet {
out.push(raw::ViewOffsetVARJO::NAME.into());
}
}
{
if self.yvr_controller_interaction {
out.push(raw::ControllerInteractionYVR::NAME.into());
}
}
for name in &self.other {
let mut bytes = Vec::with_capacity(name.len() + 1);
bytes.extend_from_slice(name.as_bytes());
Expand Down Expand Up @@ -1426,6 +1445,7 @@ pub struct InstanceExtensions {
pub ml_frame_end_info: Option<raw::FrameEndInfoML>,
pub ml_global_dimmer: Option<raw::GlobalDimmerML>,
pub ml_compat: Option<raw::CompatML>,
pub ml_user_calibration: Option<raw::UserCalibrationML>,
pub mnd_headless: Option<raw::HeadlessMND>,
pub mnd_swapchain_usage_input_attachment_bit: Option<raw::SwapchainUsageInputAttachmentBitMND>,
pub msft_unbounded_reference_space: Option<raw::UnboundedReferenceSpaceMSFT>,
Expand Down Expand Up @@ -1456,6 +1476,7 @@ pub struct InstanceExtensions {
pub varjo_environment_depth_estimation: Option<raw::EnvironmentDepthEstimationVARJO>,
pub varjo_marker_tracking: Option<raw::MarkerTrackingVARJO>,
pub varjo_view_offset: Option<raw::ViewOffsetVARJO>,
pub yvr_controller_interaction: Option<raw::ControllerInteractionYVR>,
}
impl InstanceExtensions {
#[doc = r" Load extension function pointer tables"]
Expand Down Expand Up @@ -2018,6 +2039,11 @@ impl InstanceExtensions {
} else {
None
},
ml_user_calibration: if required.ml_user_calibration {
Some(raw::UserCalibrationML::load(entry, instance)?)
} else {
None
},
mnd_headless: if required.mnd_headless {
Some(raw::HeadlessMND {})
} else {
Expand Down Expand Up @@ -2162,6 +2188,11 @@ impl InstanceExtensions {
} else {
None
},
yvr_controller_interaction: if required.yvr_controller_interaction {
Some(raw::ControllerInteractionYVR {})
} else {
None
},
})
}
}
Expand Down Expand Up @@ -2194,6 +2225,8 @@ pub enum Event<'a> {
VirtualKeyboardEnterMETA(VirtualKeyboardEnterMETA<'a>),
VirtualKeyboardShownMETA(VirtualKeyboardShownMETA<'a>),
VirtualKeyboardHiddenMETA(VirtualKeyboardHiddenMETA<'a>),
HeadsetFitChangedML(HeadsetFitChangedML<'a>),
EyeCalibrationChangedML(EyeCalibrationChangedML<'a>),
}
impl<'a> Event<'a> {
#[doc = r" Decode an event"]
Expand Down Expand Up @@ -2313,6 +2346,14 @@ impl<'a> Event<'a> {
let typed = &*(raw as *const sys::EventDataVirtualKeyboardHiddenMETA);
Event::VirtualKeyboardHiddenMETA(VirtualKeyboardHiddenMETA::new(typed))
}
sys::StructureType::EVENT_DATA_HEADSET_FIT_CHANGED_ML => {
let typed = &*(raw as *const sys::EventDataHeadsetFitChangedML);
Event::HeadsetFitChangedML(HeadsetFitChangedML::new(typed))
}
sys::StructureType::EVENT_DATA_EYE_CALIBRATION_CHANGED_ML => {
let typed = &*(raw as *const sys::EventDataEyeCalibrationChangedML);
Event::EyeCalibrationChangedML(EyeCalibrationChangedML::new(typed))
}
_ => {
return None;
}
Expand Down Expand Up @@ -2883,6 +2924,42 @@ impl<'a> VirtualKeyboardHiddenMETA<'a> {
(self.0).keyboard
}
}
#[derive(Copy, Clone)]
pub struct HeadsetFitChangedML<'a>(&'a sys::EventDataHeadsetFitChangedML);
impl<'a> HeadsetFitChangedML<'a> {
#[inline]
#[doc = r" # Safety"]
#[doc = r" `inner` must be valid event data according to the OpenXR spec. Refer to"]
#[doc = "[sys::EventDataHeadsetFitChangedML]"]
#[doc = r" for more information."]
pub unsafe fn new(inner: &'a sys::EventDataHeadsetFitChangedML) -> Self {
Self(inner)
}
#[inline]
pub fn status(self) -> HeadsetFitStatusML {
(self.0).status
}
#[inline]
pub fn time(self) -> Time {
(self.0).time
}
}
#[derive(Copy, Clone)]
pub struct EyeCalibrationChangedML<'a>(&'a sys::EventDataEyeCalibrationChangedML);
impl<'a> EyeCalibrationChangedML<'a> {
#[inline]
#[doc = r" # Safety"]
#[doc = r" `inner` must be valid event data according to the OpenXR spec. Refer to"]
#[doc = "[sys::EventDataEyeCalibrationChangedML]"]
#[doc = r" for more information."]
pub unsafe fn new(inner: &'a sys::EventDataEyeCalibrationChangedML) -> Self {
Self(inner)
}
#[inline]
pub fn status(self) -> EyeCalibrationStatusML {
(self.0).status
}
}
pub mod raw {
use crate::{Entry, Result};
use std::{ffi::CStr, mem};
Expand Down Expand Up @@ -5098,6 +5175,27 @@ pub mod raw {
}
}
#[derive(Copy, Clone)]
pub struct UserCalibrationML {
pub enable_user_calibration_events: pfn::EnableUserCalibrationEventsML,
}
impl UserCalibrationML {
pub const VERSION: u32 = sys::ML_user_calibration_SPEC_VERSION;
pub const NAME: &'static [u8] = sys::ML_USER_CALIBRATION_EXTENSION_NAME;
#[doc = r" Load the extension's function pointer table"]
#[doc = r""]
#[doc = r" # Safety"]
#[doc = r""]
#[doc = r" `instance` must be a valid instance handle."]
pub unsafe fn load(entry: &Entry, instance: sys::Instance) -> Result<Self> {
Ok(Self {
enable_user_calibration_events: mem::transmute(entry.get_instance_proc_addr(
instance,
CStr::from_bytes_with_nul_unchecked(b"xrEnableUserCalibrationEventsML\0"),
)?),
})
}
}
#[derive(Copy, Clone)]
pub struct HeadlessMND {}
impl HeadlessMND {
pub const VERSION: u32 = sys::MND_headless_SPEC_VERSION;
Expand Down Expand Up @@ -5607,6 +5705,12 @@ pub mod raw {
})
}
}
#[derive(Copy, Clone)]
pub struct ControllerInteractionYVR {}
impl ControllerInteractionYVR {
pub const VERSION: u32 = sys::YVR_controller_interaction_SPEC_VERSION;
pub const NAME: &'static [u8] = sys::YVR_CONTROLLER_INTERACTION_EXTENSION_NAME;
}
}
#[allow(unused)]
pub(crate) mod builder {
Expand Down
2 changes: 1 addition & 1 deletion sys/OpenXR-SDK
Open in desktop
Submodule OpenXR-SDK updated 26 files
+1 −1 .appveyor.yml
+4 −4 .github/workflows/android.yml
+1 −1 .github/workflows/check_clang_format_and_codespell.yml
+2 −2 .github/workflows/msvc-build-preset.yml
+2 −2 .github/workflows/windows-matrix.yml
+4 −0 .gitignore
+3 −3 .reuse/dep5
+96 −0 CHANGELOG.SDK.md
+2 −1 CMakeLists.txt
+152 −17 include/openxr/openxr.h
+1 −1 include/openxr/openxr_platform.h
+93 −0 include/openxr/openxr_reflection.h
+2 −0 include/openxr/openxr_reflection_parent_structs.h
+6 −0 include/openxr/openxr_reflection_structs.h
+1,581 −63 specification/registry/xr.xml
+14 −3 src/CMakeLists.txt
+32 −0 src/cmake/fxc_shader.cmake
+55 −0 src/cmake/glsl_shader.cmake
+26 −0 src/cmake/make_includable.cmake
+2 −2 src/common/platform_utils.hpp
+12 −11 src/external/jnipp/jnipp.cpp
+9 −3 src/loader/CMakeLists.txt
+16 −14 src/loader/api_layer_interface.cpp
+8 −1 src/xr_generated_dispatch_table.c
+7 −0 src/xr_generated_dispatch_table.h
+1 −0 src/xr_generated_dispatch_table_core.c
Loading
Loading