initial commit

src/backend/openvr/input.rs

@@ -1,4 +1,4 @@
-use std::array;
+use std::{array, io::Write, path::Path};
 
 use glam::Affine3A;
 use ovr_overlay::{
@@ -11,7 +11,7 @@ use ovr_overlay::{
     TrackedDeviceIndex,
 };
 
-use crate::backend::common::{
+use crate::backend::input::{
     InputState, InteractionState, Pointer, PointerState, TrackedDevice, TrackedDeviceRole,
 };
 
@@ -96,7 +96,8 @@ impl InputState<OpenVrInputState, OpenVrHandState> {
             .collect::<Result<_, &'static str>>()?;
 
         let hands: [Pointer<OpenVrHandState>; 2] = array::from_fn(|i| Pointer::<OpenVrHandState> {
-            hand: i,
+            idx: i,
+            hand: i as u8,
             now: PointerState::default(),
             before: PointerState::default(),
             pose: Affine3A::IDENTITY,
@@ -286,3 +287,30 @@ fn copy_from_hmd(in_mat: &HmdMatrix34_t, out_mat: &mut Affine3A) {
     out_mat.w_axis[1] = in_mat.m[1][3];
     out_mat.w_axis[2] = in_mat.m[2][3];
 }
+
+pub fn action_manifest_path() -> &'static Path {
+    let action_path = "/tmp/wlxoverlay-s/actions.json";
+    std::fs::create_dir_all("/tmp/wlxoverlay-s").unwrap();
+
+    std::fs::File::create(action_path)
+        .unwrap()
+        .write_all(include_bytes!("../../res/actions.json"))
+        .unwrap();
+
+    std::fs::File::create("/tmp/wlxoverlay-s/actions_binding_knuckles.json")
+        .unwrap()
+        .write_all(include_bytes!("../../res/actions_binding_knuckles.json"))
+        .unwrap();
+
+    std::fs::File::create("/tmp/wlxoverlay-s/actions_binding_vive.json")
+        .unwrap()
+        .write_all(include_bytes!("../../res/actions_binding_vive.json"))
+        .unwrap();
+
+    std::fs::File::create("/tmp/wlxoverlay-s/actions_binding_oculus.json")
+        .unwrap()
+        .write_all(include_bytes!("../../res/actions_binding_oculus.json"))
+        .unwrap();
+
+    Path::new(action_path)
+}

src/backend/openvr/mod.rs

@@ -1,4 +1,5 @@
 use std::{
+    collections::VecDeque,
     path::Path,
     time::{Duration, Instant},
 };
@@ -8,45 +9,73 @@ use ovr_overlay::{
     sys::{ETrackedDeviceProperty, EVRApplicationType, EVREventType},
     TrackedDeviceIndex,
 };
+use vulkano::{
+    device::{physical::PhysicalDevice, DeviceExtensions},
+    instance::InstanceExtensions,
+    Handle, VulkanObject,
+};
 
-use super::common::InputState;
+use crate::state::AppState;
+
+use self::{input::action_manifest_path, overlay::OpenVrOverlayData};
+
+use super::{
+    common::{OverlayContainer, TaskType},
+    input::InputState,
+};
 
 pub mod input;
 pub mod overlay;
 
-fn openvr_run() {
+pub fn openvr_run() {
     let app_type = EVRApplicationType::VRApplication_Overlay;
     let Ok(context) = ovr_overlay::Context::init(app_type) else {
             error!("Failed to initialize OpenVR");
             return;
         };
 
-    let mut overlay = context.overlay_mngr();
-    let mut settings = context.settings_mngr();
-    let mut input = context.input_mngr();
-    let mut system = context.system_mngr();
-    let mut compositor = context.compositor_mngr();
+    let mut overlay_mngr = context.overlay_mngr();
+    //let mut settings_mngr = context.settings_mngr();
+    let mut input_mngr = context.input_mngr();
+    let mut system_mngr = context.system_mngr();
+    let mut compositor_mngr = context.compositor_mngr();
 
-    let Ok(_) = input.set_action_manifest(Path::new("resources/actions.json")) else {
-        error!("Failed to set action manifest");
+    let device_extensions_fn = |device: &PhysicalDevice| {
+        let names = compositor_mngr.get_vulkan_device_extensions_required(device.handle().as_raw());
+        let ext = DeviceExtensions::from_iter(names.iter().map(|s| s.as_str()));
+        ext
+    };
+
+    let mut compositor_mngr = context.compositor_mngr();
+    let instance_extensions = {
+        let names = compositor_mngr.get_vulkan_instance_extensions_required();
+        InstanceExtensions::from_iter(names.iter().map(|s| s.as_str()))
+    };
+
+    let mut state = AppState::new(instance_extensions, device_extensions_fn);
+    let mut overlays = OverlayContainer::<OpenVrOverlayData>::new(&mut state);
+
+    if let Err(e) = input_mngr.set_action_manifest(action_manifest_path()) {
+        error!("Failed to set action manifest: {}", e.description());
         return;
     };
 
-    let Ok(mut input_state) = InputState::new(&mut input) else {
+    let Ok(mut input) = InputState::new(&mut input_mngr) else {
         error!("Failed to initialize input");
         return;
     };
 
-    let Ok(refresh_rate) = system.get_tracked_device_property::<f32>(TrackedDeviceIndex::HMD, ETrackedDeviceProperty::Prop_DisplayFrequency_Float) else {
+    let Ok(refresh_rate) = system_mngr.get_tracked_device_property::<f32>(TrackedDeviceIndex::HMD, ETrackedDeviceProperty::Prop_DisplayFrequency_Float) else {
         error!("Failed to get display refresh rate");
         return;
     };
 
     let frame_time = (1000.0 / refresh_rate).floor() * 0.001;
     let mut next_device_update = Instant::now();
+    let mut due_tasks = VecDeque::with_capacity(4);
 
     loop {
-        while let Some(event) = system.poll_next_event() {
+        while let Some(event) = system_mngr.poll_next_event() {
             match event.event_type {
                 EVREventType::VREvent_Quit => {
                     info!("Received quit event, shutting down.");
@@ -61,35 +90,57 @@ fn openvr_run() {
             }
 
             if next_device_update <= Instant::now() {
-                input_state.update_devices(&mut system);
+                input.update_devices(&mut system_mngr);
                 next_device_update = Instant::now() + Duration::from_secs(30);
             }
 
-            input_state.pre_update();
-            input_state.update(&mut input, &mut system);
-            input_state.post_update();
+            state.tasks.retrieve_due(&mut due_tasks);
+            while let Some(task) = due_tasks.pop_front() {
+                match task {
+                    TaskType::Global(f) => f(&mut state),
+                    TaskType::Overlay(sel, f) => {
+                        if let Some(o) = overlays.mut_by_selector(&sel) {
+                            f(&mut state, &mut o.state);
+                        }
+                    }
+                }
+            }
 
-            // task scheduler
+            input.pre_update();
+            input.update(&mut input_mngr, &mut system_mngr);
+            input.post_update();
 
-            // after input
+            input
+                .pointers
+                .iter_mut()
+                .for_each(|p| p.interact(&mut overlays, &mut state));
 
-            // interactions
+            overlays
+                .iter_mut()
+                .for_each(|o| o.after_input(&mut overlay_mngr, &mut state));
 
-            // show overlays
+            log::debug!("Rendering frame");
+
+            overlays
+                .iter_mut()
+                .filter(|o| o.state.want_visible)
+                .for_each(|o| o.render(&mut state));
+
+            log::debug!("Rendering overlays");
+
+            overlays
+                .iter_mut()
+                .for_each(|o| o.after_render(&mut overlay_mngr, &state.graphics));
 
             // chaperone
 
-            // render overlays
-
-            // hide overlays
-
-            // close font handles
+            // close font handles?
 
             // playspace moved end frame
 
             let mut seconds_since_vsync = 0f32;
             std::thread::sleep(Duration::from_secs_f32(
-                if system.get_time_since_last_vsync(&mut seconds_since_vsync, &mut 0u64) {
+                if system_mngr.get_time_since_last_vsync(&mut seconds_since_vsync, &mut 0u64) {
                     frame_time - seconds_since_vsync
                 } else {
                     0.011

src/backend/openvr/overlay.rs

@@ -1,15 +1,207 @@
-use ovr_overlay::sys::VRVulkanTextureData_t;
+use glam::Vec4;
+use ovr_overlay::{
+    overlay::{OverlayHandle, OverlayManager},
+    sys::VRVulkanTextureData_t,
+};
+use vulkano::{
+    command_buffer::{
+        synced::{
+            SyncCommandBuffer, SyncCommandBufferBuilder, SyncCommandBufferBuilderExecuteCommands,
+        },
+        AutoCommandBufferBuilder, CommandBufferExecFuture,
+    },
+    image::{ImageAccess, ImageLayout},
+    sync::{future::NowFuture, ImageMemoryBarrier},
+    Handle, VulkanObject,
+};
 
-use crate::overlays::OverlayData;
+use crate::{backend::overlay::OverlayData, graphics::WlxGraphics, state::AppState};
 
-pub(super) struct OpenVrOverlayManager {
-    pub(super) overlays: Vec<OpenVrOverlay>,
-}
-
-pub(super) struct OpenVrOverlay {
+#[derive(Default)]
+pub(super) struct OpenVrOverlayData {
+    handle: Option<OverlayHandle>,
+    last_image: Option<u64>,
     pub(super) visible: bool,
-    pub(super) color: [f32; 4],
-    overlay: OverlayData,
-    handle: u32,
-    ovr_texture: VRVulkanTextureData_t,
+    pub(super) color: Vec4,
+    pub(super) curvature: f32,
+    pub(super) sort_order: u32,
+}
+
+impl OverlayData<OpenVrOverlayData> {
+    pub fn initialize(
+        &mut self,
+        overlay: &mut OverlayManager,
+        app: &mut AppState,
+    ) -> OverlayHandle {
+        let key = format!("wlx-{}", self.state.name);
+        let handle = match overlay.create_overlay(&key, &key) {
+            Ok(handle) => handle,
+            Err(e) => {
+                panic!("Failed to create overlay: {}", e);
+            }
+        };
+        log::debug!("{}: initialize", self.state.name);
+
+        self.data.handle = Some(handle);
+
+        self.init(app);
+
+        self.upload_width(overlay);
+        self.upload_color(overlay);
+        self.upload_curvature(overlay);
+
+        handle
+    }
+
+    pub fn after_input(&mut self, overlay: &mut OverlayManager, app: &mut AppState) {
+        if self.state.want_visible && !self.data.visible {
+            self.show(overlay, app);
+        } else if !self.state.want_visible && self.data.visible {
+            self.hide(overlay);
+        }
+    }
+
+    pub fn after_render(&mut self, overlay: &mut OverlayManager, graphics: &WlxGraphics) {
+        if self.data.visible {
+            self.upload_texture(overlay, graphics);
+        }
+    }
+
+    fn show(&mut self, overlay: &mut OverlayManager, app: &mut AppState) {
+        let handle = match self.data.handle {
+            Some(handle) => handle,
+            None => self.initialize(overlay, app),
+        };
+        log::debug!("{}: show", self.state.name);
+        if let Err(e) = overlay.set_visibility(handle, true) {
+            panic!("Failed to show overlay: {}", e);
+        }
+        self.data.visible = true;
+    }
+
+    fn hide(&mut self, overlay: &mut OverlayManager) {
+        let Some(handle) = self.data.handle else {
+            return;
+        };
+        log::debug!("{}: hide", self.state.name);
+        if let Err(e) = overlay.set_visibility(handle, false) {
+            panic!("Failed to hide overlay: {}", e);
+        }
+        self.data.visible = false;
+    }
+
+    fn upload_color(&self, overlay: &mut OverlayManager) {
+        let Some(handle) = self.data.handle else {
+            log::debug!("{}: No overlay handle", self.state.name);
+            return;
+        };
+        if let Err(e) = overlay.set_opacity(handle, self.data.color.w) {
+            panic!("Failed to set overlay opacity: {}", e);
+        }
+        if let Err(e) = overlay.set_tint(
+            handle,
+            ovr_overlay::ColorTint {
+                r: self.data.color.x,
+                g: self.data.color.y,
+                b: self.data.color.z,
+                a: 1.0,
+            },
+        ) {
+            panic!("Failed to set overlay tint: {}", e);
+        }
+    }
+
+    fn upload_width(&self, overlay: &mut OverlayManager) {
+        let Some(handle) = self.data.handle else {
+            log::debug!("{}: No overlay handle", self.state.name);
+            return;
+        };
+        if let Err(e) = overlay.set_width(handle, self.state.width) {
+            panic!("Failed to set overlay width: {}", e);
+        }
+    }
+
+    fn upload_curvature(&self, overlay: &mut OverlayManager) {
+        let Some(handle) = self.data.handle else {
+            log::debug!("{}: No overlay handle", self.state.name);
+            return;
+        };
+        if let Err(e) = overlay.set_curvature(handle, self.data.curvature) {
+            panic!("Failed to set overlay curvature: {}", e);
+        }
+    }
+
+    fn upload_sort_order(&self, overlay: &mut OverlayManager) {
+        let Some(handle) = self.data.handle else {
+            log::debug!("{}: No overlay handle", self.state.name);
+            return;
+        };
+        if let Err(e) = overlay.set_sort_order(handle, self.data.sort_order) {
+            panic!("Failed to set overlay z order: {}", e);
+        }
+    }
+
+    fn upload_texture(&mut self, overlay: &mut OverlayManager, graphics: &WlxGraphics) {
+        let Some(handle) = self.data.handle else {
+            log::debug!("{}: No overlay handle", self.state.name);
+            return;
+        };
+
+        let Some(view) = self.backend.view() else {
+            log::debug!("{}: Not rendered", self.state.name);
+            return;
+        };
+
+        let image = view.image().inner().image.clone();
+
+        let raw_image = image.handle().as_raw();
+
+        if let Some(last_image) = self.data.last_image {
+            if last_image == raw_image {
+                return;
+            }
+        }
+
+        let Some(format) = image.format() else {
+            panic!("{}: Image format is None", self.state.name);
+        };
+
+        let dimensions = image.dimensions();
+
+        let mut texture = VRVulkanTextureData_t {
+            m_nImage: raw_image,
+            m_nFormat: format as _,
+            m_nWidth: dimensions.width(),
+            m_nHeight: dimensions.height(),
+            m_nSampleCount: image.samples() as u32,
+            m_pDevice: graphics.device.handle().as_raw() as *mut _,
+            m_pPhysicalDevice: graphics.device.physical_device().handle().as_raw() as *mut _,
+            m_pInstance: graphics.instance.handle().as_raw() as *mut _,
+            m_pQueue: graphics.queue.handle().as_raw() as *mut _,
+            m_nQueueFamilyIndex: graphics.queue.queue_family_index(),
+        };
+
+        graphics
+            .transition_layout(
+                image.clone(),
+                ImageLayout::ColorAttachmentOptimal,
+                ImageLayout::TransferSrcOptimal,
+            )
+            .wait(None)
+            .unwrap();
+
+        log::info!("nImage: {}, nFormat: {:?}, nWidth: {}, nHeight: {}, nSampleCount: {}, nQueueFamilyIndex: {}", texture.m_nImage, format, texture.m_nWidth, texture.m_nHeight, texture.m_nSampleCount, texture.m_nQueueFamilyIndex);
+        if let Err(e) = overlay.set_image_vulkan(handle, &mut texture) {
+            panic!("Failed to set overlay texture: {}", e);
+        }
+
+        graphics
+            .transition_layout(
+                image,
+                ImageLayout::TransferSrcOptimal,
+                ImageLayout::ColorAttachmentOptimal,
+            )
+            .wait(None)
+            .unwrap();
+    }
 }