openxr lasers

src/backend/openxr/input.rs

@@ -10,7 +10,6 @@ type XrSession = xr::Session<xr::Vulkan>;
 pub(super) struct OpenXrInputSource {
     action_set: xr::ActionSet,
     hands: [OpenXrHand; 2],
-    pub(super) stage: xr::Space,
 }
 
 pub(super) struct OpenXrHand {
@@ -45,18 +44,12 @@ impl OpenXrInputSource {
 
         xr.session.attach_action_sets(&[&action_set]).unwrap();
 
-        let stage = xr
-            .session
-            .create_reference_space(xr::ReferenceSpaceType::STAGE, xr::Posef::IDENTITY)
-            .unwrap();
-
         Self {
             action_set,
             hands: [
                 OpenXrHand::new(&xr, left_source),
                 OpenXrHand::new(&xr, right_source),
             ],
-            stage,
         }
     }
 
@@ -68,7 +61,7 @@ impl OpenXrInputSource {
         for i in 0..2 {
             self.hands[i].update(
                 &mut state.input_state.pointers[i],
-                &self.stage,
+                &xr.stage,
                 &xr.session,
                 xr.predicted_display_time,
             );

src/backend/openxr/lines.rs

@@ -0,0 +1,137 @@
+use glam::{Affine3A, Vec3, Vec3A};
+use idmap::IdMap;
+use openxr as xr;
+use std::{
+    f32::consts::PI,
+    sync::{
+        atomic::{AtomicUsize, Ordering},
+        Arc,
+    },
+};
+
+use vulkano::{command_buffer::CommandBufferUsage, format::Format, image::view::ImageView};
+
+use crate::graphics::{WlxCommandBuffer, WlxGraphics};
+
+use super::{
+    swapchain::{create_swapchain_render_data, SwapchainRenderData},
+    transform_to_posef, XrState,
+};
+
+static AUTO_INCREMENT: AtomicUsize = AtomicUsize::new(1);
+pub(super) const LINE_WIDTH: f32 = 0.002;
+
+pub(super) struct LinePool {
+    lines: IdMap<usize, LineContainer>,
+    colors: Vec<Arc<ImageView>>,
+}
+
+impl LinePool {
+    pub(super) fn new(graphics: Arc<WlxGraphics>) -> Self {
+        let mut command_buffer = graphics.create_command_buffer(CommandBufferUsage::OneTimeSubmit);
+
+        // TODO customizable colors
+        let colors = [
+            [0xff, 0xff, 0xff, 0xff],
+            [0x00, 0x60, 0x80, 0xff],
+            [0xB0, 0x30, 0x00, 0xff],
+            [0x60, 0x00, 0x80, 0xff],
+        ];
+
+        let views = colors
+            .into_iter()
+            .map(|color| {
+                let tex = command_buffer.texture2d(1, 1, Format::R8G8B8A8_UNORM, &color);
+                ImageView::new_default(tex).unwrap()
+            })
+            .collect::<Vec<_>>();
+
+        command_buffer.build_and_execute_now();
+
+        LinePool {
+            lines: IdMap::new(),
+            colors: views,
+        }
+    }
+
+    pub(super) fn allocate(&mut self, xr: &XrState, graphics: Arc<WlxGraphics>) -> usize {
+        let id = AUTO_INCREMENT.fetch_add(1, Ordering::Relaxed);
+
+        let srd = create_swapchain_render_data(xr, graphics, [1, 1, 1]);
+        self.lines.insert(
+            id,
+            LineContainer {
+                swapchain: srd,
+                maybe_line: None,
+            },
+        );
+        id
+    }
+
+    pub(super) fn draw_from(&mut self, id: usize, mut from: Affine3A, len: f32, color: usize) {
+        if len < 0.01 {
+            return;
+        }
+
+        debug_assert!(color < self.colors.len());
+
+        let Some(line) = self.lines.get_mut(&id) else {
+            log::warn!("Line {} not found", id);
+            return;
+        };
+
+        let rotation = Affine3A::from_axis_angle(Vec3::X, PI * 1.5);
+
+        from.translation = from.translation + from.transform_vector3a(Vec3A::NEG_Z) * (len * 0.5);
+        let transform = from * rotation;
+
+        let posef = transform_to_posef(&transform);
+
+        line.maybe_line = Some(Line {
+            view: self.colors[color].clone(),
+            pose: posef,
+            length: len,
+        });
+    }
+
+    pub(super) fn present_xr<'a>(
+        &'a mut self,
+        xr: &'a XrState,
+        command_buffer: &mut WlxCommandBuffer,
+    ) -> Vec<xr::CompositionLayerQuad<xr::Vulkan>> {
+        let mut quads = Vec::new();
+
+        for line in self.lines.values_mut() {
+            if let Some(inner) = line.maybe_line.take() {
+                let quad = xr::CompositionLayerQuad::new()
+                    .pose(inner.pose)
+                    .sub_image(
+                        line.swapchain
+                            .acquire_present_release(command_buffer, inner.view),
+                    )
+                    .eye_visibility(xr::EyeVisibility::BOTH)
+                    .layer_flags(xr::CompositionLayerFlags::CORRECT_CHROMATIC_ABERRATION)
+                    .space(&xr.stage)
+                    .size(xr::Extent2Df {
+                        width: LINE_WIDTH,
+                        height: inner.length,
+                    });
+
+                quads.push(quad);
+            }
+        }
+
+        quads
+    }
+}
+
+pub(super) struct Line {
+    pub(super) view: Arc<ImageView>,
+    pub(super) pose: xr::Posef,
+    pub(super) length: f32,
+}
+
+struct LineContainer {
+    swapchain: SwapchainRenderData,
+    maybe_line: Option<Line>,
+}

src/backend/openxr/mod.rs

@@ -9,11 +9,14 @@ use std::{
 use anyhow::{bail, ensure};
 use glam::{Affine3A, Quat, Vec3};
 use openxr as xr;
-use vulkano::{Handle, VulkanObject};
-use xr::{CompositionLayerFlags, EyeVisibility};
+use vulkano::{command_buffer::CommandBufferUsage, Handle, VulkanObject};
 
 use crate::{
-    backend::{common::OverlayContainer, input::interact, openxr::overlay::OpenXrOverlayData},
+    backend::{
+        common::OverlayContainer,
+        input::interact,
+        openxr::{lines::LinePool, overlay::OpenXrOverlayData},
+    },
     graphics::WlxGraphics,
     state::AppState,
 };
@@ -23,6 +26,7 @@ use super::common::BackendError;
 mod input;
 mod lines;
 mod overlay;
+mod swapchain;
 
 const VIEW_TYPE: xr::ViewConfigurationType = xr::ViewConfigurationType::PRIMARY_STEREO;
 const VIEW_COUNT: u32 = 2;
@@ -32,6 +36,7 @@ struct XrState {
     system: xr::SystemId,
     session: xr::Session<xr::Vulkan>,
     predicted_display_time: xr::Time,
+    stage: Arc<xr::Space>,
 }
 
 pub fn openxr_run(running: Arc<AtomicBool>) -> Result<(), BackendError> {
@@ -54,6 +59,7 @@ pub fn openxr_run(running: Arc<AtomicBool>) -> Result<(), BackendError> {
     };
 
     let mut overlays = OverlayContainer::<OpenXrOverlayData>::new(&mut app_state);
+    let mut lines = LinePool::new(app_state.graphics.clone());
 
     app_state.hid_provider.set_desktop_extent(overlays.extent);
 
@@ -77,13 +83,23 @@ pub fn openxr_run(running: Arc<AtomicBool>) -> Result<(), BackendError> {
             .unwrap()
     };
 
+    let stage = session
+        .create_reference_space(xr::ReferenceSpaceType::STAGE, xr::Posef::IDENTITY)
+        .unwrap();
+
     let mut xr_state = XrState {
         instance: xr_instance,
         system,
         session,
         predicted_display_time: xr::Time::from_nanos(0),
+        stage: Arc::new(stage),
     };
 
+    let pointer_lines = [
+        lines.allocate(&xr_state, app_state.graphics.clone()),
+        lines.allocate(&xr_state, app_state.graphics.clone()),
+    ];
+
     let input_source = input::OpenXrInputSource::new(&xr_state);
 
     let mut session_running = false;
@@ -164,17 +180,26 @@ pub fn openxr_run(running: Arc<AtomicBool>) -> Result<(), BackendError> {
             .locate_views(
                 VIEW_TYPE,
                 xr_frame_state.predicted_display_time,
-                &input_source.stage,
+                &xr_state.stage,
             )
             .unwrap();
 
         app_state.input_state.hmd = hmd_pose_from_views(&views);
 
-        let _pointer_lengths = interact(&mut overlays, &mut app_state);
-
-        //TODO lines
+        let pointer_lengths = interact(&mut overlays, &mut app_state);
+        for (idx, len) in pointer_lengths.iter().enumerate() {
+            lines.draw_from(
+                pointer_lines[idx],
+                app_state.input_state.pointers[idx].pose,
+                *len,
+                0,
+            );
+        }
 
         let mut layers = vec![];
+        let mut command_buffer = app_state
+            .graphics
+            .create_command_buffer(CommandBufferUsage::OneTimeSubmit);
 
         for o in overlays.iter_mut() {
             if !o.state.want_visible {
@@ -186,23 +211,18 @@ pub fn openxr_run(running: Arc<AtomicBool>) -> Result<(), BackendError> {
                 o.data.init = true;
             }
             o.render(&mut app_state);
-            let transform = o.state.transform;
 
-            let Some((sub_image, extent)) = o.present_xr(&xr_state, &mut app_state) else {
-                continue;
+            if let Some(quad) = o.present_xr(&xr_state, &mut command_buffer) {
+                layers.push(quad);
             };
+        }
 
-            let quad = xr::CompositionLayerQuad::new()
-                .pose(transform_to_posef(&transform))
-                .sub_image(sub_image)
-                .eye_visibility(EyeVisibility::BOTH)
-                .layer_flags(CompositionLayerFlags::CORRECT_CHROMATIC_ABERRATION)
-                .space(&input_source.stage)
-                .size(extent);
-
+        for quad in lines.present_xr(&xr_state, &mut command_buffer) {
             layers.push(quad);
         }
 
+        command_buffer.build_and_execute_now();
+
         let frame_ref = layers
             .iter()
             .map(|f| f as &xr::CompositionLayerBase<xr::Vulkan>)
@@ -328,7 +348,7 @@ fn quat_lerp(a: Quat, mut b: Quat, t: f32) -> Quat {
 
 fn transform_to_posef(transform: &Affine3A) -> xr::Posef {
     let translation = transform.translation;
-    let rotation = Quat::from_mat3a(&transform.matrix3);
+    let rotation = Quat::from_affine3(transform).normalize();
 
     xr::Posef {
         orientation: xr::Quaternionf {

src/backend/openxr/overlay.rs

@@ -1,29 +1,27 @@
-use std::sync::Arc;
-
-use super::XrState;
-use crate::{backend::overlay::OverlayData, graphics::WlxPipeline, state::AppState};
-use ash::vk::{self};
 use openxr as xr;
-use vulkano::{
-    command_buffer::CommandBufferUsage,
-    image::{sampler::Filter, view::ImageView, ImageCreateInfo, ImageUsage},
-    render_pass::{Framebuffer, FramebufferCreateInfo},
-    Handle,
+use std::sync::Arc;
+use xr::{CompositionLayerFlags, EyeVisibility};
+
+use super::{swapchain::SwapchainRenderData, transform_to_posef, XrState};
+use crate::{
+    backend::{openxr::swapchain::create_swapchain_render_data, overlay::OverlayData},
+    graphics::WlxCommandBuffer,
 };
+use vulkano::image::view::ImageView;
 
 #[derive(Default)]
 pub struct OpenXrOverlayData {
     last_view: Option<Arc<ImageView>>,
-    inner: Option<XrOverlayData>,
+    pub(super) swapchain: Option<SwapchainRenderData>,
     pub(super) init: bool,
 }
 
 impl OverlayData<OpenXrOverlayData> {
-    pub(super) fn present_xr(
-        &mut self,
-        xr: &XrState,
-        state: &mut AppState,
-    ) -> Option<(xr::SwapchainSubImage<xr::Vulkan>, xr::Extent2Df)> {
+    pub(super) fn present_xr<'a>(
+        &'a mut self,
+        xr: &'a XrState,
+        command_buffer: &mut WlxCommandBuffer,
+    ) -> Option<xr::CompositionLayerQuad<xr::Vulkan>> {
         if let Some(new_view) = self.view() {
             self.data.last_view = Some(new_view);
         }
@@ -35,152 +33,35 @@ impl OverlayData<OpenXrOverlayData> {
             return None;
         };
 
-        let data = self.data.inner.get_or_insert_with(|| {
+        let data = self.data.swapchain.get_or_insert_with(|| {
             let extent = self.backend.extent();
-
-            let swapchain = xr
-                .session
-                .create_swapchain(&xr::SwapchainCreateInfo {
-                    create_flags: xr::SwapchainCreateFlags::EMPTY,
-                    usage_flags: xr::SwapchainUsageFlags::COLOR_ATTACHMENT
-                        | xr::SwapchainUsageFlags::SAMPLED,
-                    format: state.graphics.native_format as _,
-                    sample_count: 1,
-                    width: extent[0],
-                    height: extent[1],
-                    face_count: 1,
-                    array_size: 1,
-                    mip_count: 1,
-                })
-                .unwrap();
-
-            let framebuffers: Vec<XrFramebuffer> = swapchain
-                .enumerate_images()
-                .unwrap()
-                .into_iter()
-                .map(|handle| {
-                    let vk_image = vk::Image::from_raw(handle);
-                    // thanks @yshui
-                    let raw_image = unsafe {
-                        vulkano::image::sys::RawImage::from_handle(
-                            state.graphics.device.clone(),
-                            vk_image,
-                            ImageCreateInfo {
-                                format: state.graphics.native_format,
-                                extent,
-                                usage: ImageUsage::COLOR_ATTACHMENT | ImageUsage::TRANSFER_DST,
-                                ..Default::default()
-                            },
-                        )
-                        .unwrap()
-                    };
-                    // SAFETY: OpenXR guarantees that the image is a swapchain image, thus has memory backing it.
-                    let image = Arc::new(unsafe { raw_image.assume_bound() });
-                    let view = ImageView::new_default(image).unwrap();
-
-                    // HACK: maybe not create one pipeline per image?
-
-                    let shaders = state.graphics.shared_shaders.read().unwrap();
-
-                    let pipeline = state.graphics.create_pipeline(
-                        view.clone(),
-                        shaders.get("vert_common").unwrap().clone(),
-                        shaders.get("frag_srgb").unwrap().clone(),
-                        state.graphics.native_format,
-                    );
-
-                    let inner = Framebuffer::new(
-                        pipeline.render_pass.clone(),
-                        FramebufferCreateInfo {
-                            attachments: vec![view.clone()],
-                            extent: [view.image().extent()[0] as _, view.image().extent()[1] as _],
-                            layers: 1,
-                            ..Default::default()
-                        },
-                    )
-                    .unwrap();
-
-                    XrFramebuffer {
-                        inner,
-                        view,
-                        pipeline,
-                    }
-                })
-                .collect();
+            let srd = create_swapchain_render_data(xr, command_buffer.graphics.clone(), extent);
 
             log::info!(
                 "{}: Created swapchain {}x{}, {} images, {} MB",
                 self.state.name,
                 extent[0],
                 extent[1],
-                framebuffers.len(),
-                extent[0] * extent[1] * 4 * framebuffers.len() as u32 / 1024 / 1024
+                srd.images.len(),
+                extent[0] * extent[1] * 4 * srd.images.len() as u32 / 1024 / 1024
             );
-
-            XrOverlayData {
-                swapchain,
-                framebuffers,
-                extent,
-            }
+            srd
         });
 
-        let idx = data.swapchain.acquire_image().unwrap();
+        let sub_image = data.acquire_present_release(command_buffer, my_view);
+        let posef = transform_to_posef(&self.state.transform);
 
-        data.swapchain.wait_image(xr::Duration::INFINITE).unwrap();
-
-        let frame = &data.framebuffers[idx as usize];
-        let mut command_buffer = state
-            .graphics
-            .create_command_buffer(CommandBufferUsage::OneTimeSubmit)
-            .begin_render_pass(&frame.pipeline);
-
-        let set = frame
-            .pipeline
-            .uniform_sampler(0, my_view.clone(), Filter::Linear);
-        let pass = frame.pipeline.create_pass(
-            [
-                my_view.image().extent()[0] as _,
-                my_view.image().extent()[1] as _,
-            ],
-            state.graphics.quad_verts.clone(),
-            state.graphics.quad_indices.clone(),
-            vec![set],
-        );
-
-        command_buffer.run_ref(&pass);
-        command_buffer.end_render_pass().build_and_execute_now();
-
-        data.swapchain.release_image().unwrap();
-
-        let extent = xr::Extent2Df {
-            width: self.state.width,
-            height: (data.extent[1] as f32 / data.extent[0] as f32) * self.state.width,
-        };
-
-        Some((
-            xr::SwapchainSubImage::new()
-                .swapchain(&data.swapchain)
-                .image_rect(xr::Rect2Di {
-                    offset: xr::Offset2Di { x: 0, y: 0 },
-                    extent: xr::Extent2Di {
-                        width: data.extent[0] as _,
-                        height: data.extent[1] as _,
-                    },
-                })
-                .image_array_index(0),
-            extent,
-        ))
+        let quad = xr::CompositionLayerQuad::new()
+            .pose(posef)
+            .sub_image(sub_image)
+            .eye_visibility(EyeVisibility::BOTH)
+            .layer_flags(CompositionLayerFlags::CORRECT_CHROMATIC_ABERRATION)
+            .space(&xr.stage)
+            .size(xr::Extent2Df {
+                width: self.state.width,
+                height: (self.backend.extent()[1] as f32 / self.backend.extent()[0] as f32)
+                    * self.state.width,
+            });
+        Some(quad)
     }
 }
-
-struct XrOverlayData {
-    swapchain: xr::Swapchain<xr::Vulkan>,
-    extent: [u32; 3],
-    framebuffers: Vec<XrFramebuffer>,
-}
-
-struct XrFramebuffer {
-    inner: Arc<Framebuffer>,
-    view: Arc<ImageView>,
-    pipeline: Arc<WlxPipeline>,
-}

src/backend/openxr/swapchain.rs

@@ -0,0 +1,149 @@
+use std::sync::Arc;
+
+use ash::vk;
+use openxr as xr;
+
+use vulkano::{
+    image::{sampler::Filter, view::ImageView, ImageCreateInfo, ImageUsage},
+    render_pass::{Framebuffer, FramebufferCreateInfo},
+    Handle,
+};
+
+use crate::graphics::{WlxCommandBuffer, WlxGraphics, WlxPipeline};
+
+use super::XrState;
+
+pub(super) fn create_swapchain_render_data(
+    xr: &XrState,
+    graphics: Arc<WlxGraphics>,
+    extent: [u32; 3],
+) -> SwapchainRenderData {
+    let swapchain = xr
+        .session
+        .create_swapchain(&xr::SwapchainCreateInfo {
+            create_flags: xr::SwapchainCreateFlags::EMPTY,
+            usage_flags: xr::SwapchainUsageFlags::COLOR_ATTACHMENT
+                | xr::SwapchainUsageFlags::SAMPLED,
+            format: graphics.native_format as _,
+            sample_count: 1,
+            width: extent[0],
+            height: extent[1],
+            face_count: 1,
+            array_size: 1,
+            mip_count: 1,
+        })
+        .unwrap();
+
+    let sips: Vec<SwapchainImagePipeline> = swapchain
+        .enumerate_images()
+        .unwrap()
+        .into_iter()
+        .map(|handle| {
+            let vk_image = vk::Image::from_raw(handle);
+            // thanks @yshui
+            let raw_image = unsafe {
+                vulkano::image::sys::RawImage::from_handle(
+                    graphics.device.clone(),
+                    vk_image,
+                    ImageCreateInfo {
+                        format: graphics.native_format,
+                        extent,
+                        usage: ImageUsage::COLOR_ATTACHMENT | ImageUsage::TRANSFER_DST,
+                        ..Default::default()
+                    },
+                )
+                .unwrap()
+            };
+            // SAFETY: OpenXR guarantees that the image is a swapchain image, thus has memory backing it.
+            let image = Arc::new(unsafe { raw_image.assume_bound() });
+            let view = ImageView::new_default(image).unwrap();
+
+            // HACK: maybe not create one pipeline per image?
+
+            let shaders = graphics.shared_shaders.read().unwrap();
+
+            let pipeline = graphics.create_pipeline(
+                view.clone(),
+                shaders.get("vert_common").unwrap().clone(),
+                shaders.get("frag_srgb").unwrap().clone(),
+                graphics.native_format,
+            );
+
+            let buffer = Framebuffer::new(
+                pipeline.render_pass.clone(),
+                FramebufferCreateInfo {
+                    attachments: vec![view.clone()],
+                    extent: [view.image().extent()[0] as _, view.image().extent()[1] as _],
+                    layers: 1,
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+
+            SwapchainImagePipeline {
+                buffer,
+                view,
+                pipeline,
+            }
+        })
+        .collect();
+
+    SwapchainRenderData {
+        swapchain,
+        images: sips,
+        extent,
+    }
+}
+
+pub(super) struct SwapchainRenderData {
+    pub(super) swapchain: xr::Swapchain<xr::Vulkan>,
+    pub(super) extent: [u32; 3],
+    pub(super) images: Vec<SwapchainImagePipeline>,
+}
+
+pub(super) struct SwapchainImagePipeline {
+    pub(super) view: Arc<ImageView>,
+    pub(super) buffer: Arc<Framebuffer>,
+    pub(super) pipeline: Arc<WlxPipeline>,
+}
+
+impl SwapchainRenderData {
+    pub(super) fn acquire_present_release(
+        &mut self,
+        command_buffer: &mut WlxCommandBuffer,
+        view: Arc<ImageView>,
+    ) -> xr::SwapchainSubImage<xr::Vulkan> {
+        let idx = self.swapchain.acquire_image().unwrap() as usize;
+        self.swapchain.wait_image(xr::Duration::INFINITE).unwrap();
+
+        let image = &mut self.images[idx];
+        let pipeline = image.pipeline.clone();
+        command_buffer.begin_render_pass(&pipeline);
+
+        let target_extent = image.pipeline.view.image().extent();
+        let set = image
+            .pipeline
+            .uniform_sampler(0, view.clone(), Filter::Linear);
+        let pass = image.pipeline.create_pass(
+            [target_extent[0] as _, target_extent[1] as _],
+            command_buffer.graphics.quad_verts.clone(),
+            command_buffer.graphics.quad_indices.clone(),
+            vec![set],
+        );
+        command_buffer.run_ref(&pass);
+        command_buffer.end_render_pass();
+
+        self.swapchain.release_image().unwrap();
+
+        xr::SwapchainSubImage::new()
+            .swapchain(&self.swapchain)
+            .image_rect(xr::Rect2Di {
+                offset: xr::Offset2Di { x: 0, y: 0 },
+                extent: xr::Extent2Di {
+                    width: target_extent[0] as _,
+                    height: target_extent[1] as _,
+                },
+            })
+            .image_array_index(0)
+    }
+}