refactor(client_openxr): ♻️ Do not recreate OpenXR session

alvr-org · Nov 23, 2024 · 4986cb3 · 4986cb3
1 parent c8d74f5
commit 4986cb3
Show file tree

Hide file tree

Showing 6 changed files with 538 additions and 515 deletions.
diff --git a/alvr/client_openxr/src/extra_extensions/multimodal_input.rs b/alvr/client_openxr/src/extra_extensions/multimodal_input.rs
@@ -14,47 +14,104 @@ pub const META_DETACHED_CONTROLLERS_EXTENSION_NAME: &str = "XR_META_detached_con
 
 static TYPE_SIMULTANEOUS_HANDS_AND_CONTROLLERS_TRACKING_RESUME_INFO_META: Lazy<xr::StructureType> =
     Lazy::new(|| xr::StructureType::from_raw(1000532002));
+static TYPE_SIMULTANEOUS_HANDS_AND_CONTROLLERS_TRACKING_PAUSE_INFO_META: Lazy<xr::StructureType> =
+    Lazy::new(|| xr::StructureType::from_raw(1000532003));
 
 #[repr(C)]
 pub struct SimultaneousHandsAndControllersTrackingResumeInfoMETA {
     ty: xr::StructureType,
     next: *const c_void,
 }
+#[repr(C)]
+pub struct SimultaneousHandsAndControllersTrackingPauseInfoMETA {
+    ty: xr::StructureType,
+    next: *const c_void,
+}
 
 pub type ResumeSimultaneousHandsAndControllersTrackingMETA =
     unsafe extern "system" fn(
         sys::Session,
         *const SimultaneousHandsAndControllersTrackingResumeInfoMETA,
     ) -> sys::Result;
+pub type PauseSimultaneousHandsAndControllersTrackingMETA =
+    unsafe extern "system" fn(
+        sys::Session,
+        *const SimultaneousHandsAndControllersTrackingPauseInfoMETA,
+    ) -> sys::Result;
+
+pub struct MultimodalHandsHandle {
+    session: xr::Session<xr::AnyGraphics>,
+    pause_simultaneous_hands_and_controllers_tracking_meta:
+        PauseSimultaneousHandsAndControllersTrackingMETA,
+}
 
-pub fn resume_simultaneous_hands_and_controllers_tracking<G>(
-    session: &xr::Session<G>,
-) -> xr::Result<()> {
-    let resume_simultaneous_hands_and_controllers_tracking_meta = unsafe {
-        let mut resume_simultaneous_hands_and_controllers_tracking_meta = None;
-        let _ = (session.instance().fp().get_instance_proc_addr)(
-            session.instance().as_raw(),
-            c"xrResumeSimultaneousHandsAndControllersTrackingMETA".as_ptr(),
-            &mut resume_simultaneous_hands_and_controllers_tracking_meta,
-        );
-
-        resume_simultaneous_hands_and_controllers_tracking_meta.map(|pfn| {
-            mem::transmute::<VoidFunction, ResumeSimultaneousHandsAndControllersTrackingMETA>(pfn)
+impl MultimodalHandsHandle {
+    pub fn new<G>(session: xr::Session<G>) -> xr::Result<Self> {
+        let session = session.into_any_graphics();
+
+        let resume_simultaneous_hands_and_controllers_tracking_meta = unsafe {
+            let mut resume_simultaneous_hands_and_controllers_tracking_meta = None;
+            let _ = (session.instance().fp().get_instance_proc_addr)(
+                session.instance().as_raw(),
+                c"xrResumeSimultaneousHandsAndControllersTrackingMETA".as_ptr(),
+                &mut resume_simultaneous_hands_and_controllers_tracking_meta,
+            );
+
+            resume_simultaneous_hands_and_controllers_tracking_meta.map(|pfn| {
+                mem::transmute::<VoidFunction, ResumeSimultaneousHandsAndControllersTrackingMETA>(
+                    pfn,
+                )
+            })
+        }
+        .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
+
+        let pause_simultaneous_hands_and_controllers_tracking_meta = unsafe {
+            let mut pause_simultaneous_hands_and_controllers_tracking_meta = None;
+            let _ = (session.instance().fp().get_instance_proc_addr)(
+                session.instance().as_raw(),
+                c"xrPauseSimultaneousHandsAndControllersTrackingMETA".as_ptr(),
+                &mut pause_simultaneous_hands_and_controllers_tracking_meta,
+            );
+
+            pause_simultaneous_hands_and_controllers_tracking_meta.map(|pfn| {
+                mem::transmute::<VoidFunction, PauseSimultaneousHandsAndControllersTrackingMETA>(
+                    pfn,
+                )
+            })
+        }
+        .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
+
+        let resume_info = SimultaneousHandsAndControllersTrackingResumeInfoMETA {
+            ty: *TYPE_SIMULTANEOUS_HANDS_AND_CONTROLLERS_TRACKING_RESUME_INFO_META,
+            next: ptr::null(),
+        };
+        unsafe {
+            super::xr_res(resume_simultaneous_hands_and_controllers_tracking_meta(
+                session.as_raw(),
+                &resume_info,
+            ))?;
+        }
+
+        Ok(Self {
+            session,
+            pause_simultaneous_hands_and_controllers_tracking_meta,
         })
     }
-    .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
-
-    let resume_info = SimultaneousHandsAndControllersTrackingResumeInfoMETA {
-        ty: *TYPE_SIMULTANEOUS_HANDS_AND_CONTROLLERS_TRACKING_RESUME_INFO_META,
-        next: ptr::null(),
-    };
-
-    unsafe {
-        super::xr_res(resume_simultaneous_hands_and_controllers_tracking_meta(
-            session.as_raw(),
-            &resume_info,
-        ))?;
-    }
+}
 
-    Ok(())
+impl Drop for MultimodalHandsHandle {
+    fn drop(&mut self) {
+        let pause_info = SimultaneousHandsAndControllersTrackingPauseInfoMETA {
+            ty: *TYPE_SIMULTANEOUS_HANDS_AND_CONTROLLERS_TRACKING_PAUSE_INFO_META,
+            next: ptr::null(),
+        };
+        unsafe {
+            super::xr_res((self
+                .pause_simultaneous_hands_and_controllers_tracking_meta)(
+                self.session.as_raw(),
+                &pause_info,
+            ))
+            .ok();
+        }
+    }
 }