StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

feat(wayland): set output refreshrate to i32::MAX and instrument a bunch of functions

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2025-07-15 22:15:15 +02:00
parent 81a741ad36
commit 0b4c7edc92
10 changed files with 162 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wayland/dmabuf/buffer_backing.rs
View File

@@ -11,6 +11,7 @@ use bevy_dmabuf::{
use drm_fourcc::DrmFourcc;
use mint::Vector2;
use parking_lot::Mutex;
use tracing::info;
use std::sync::{Arc, OnceLock};
use waynest::server::protocol::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::Flags;
@@ -39,6 +40,7 @@ impl std::fmt::Debug for DmabufBacking {
}
impl DmabufBacking {
#[tracing::instrument("debug", skip_all)]
pub fn new(
params: Arc<BufferParams>,
message_sink: Option<MessageSink>,
@@ -74,11 +76,13 @@ impl DmabufBacking {
})
}
#[tracing::instrument("debug", skip_all)]
pub fn update_tex(
&self,
dmatexes: &ImportedDmatexs,
images: &mut Assets<Image>,
) -> Option<Handle<Image>> {
info!("updating dmabuf tex");
self.pending_imported_dmatex
.lock()
.take()

5
src/wayland/dmabuf/buffer_params.rs
View File

@@ -30,6 +30,7 @@ pub struct BufferParams {
}
impl BufferParams {
#[tracing::instrument("debug", skip_all)]
pub fn new(id: ObjectId) -> Self {
tracing::info!("Creating new BufferParams with id {:?}", id);
Self {
@@ -45,6 +46,7 @@ impl ZwpLinuxBufferParamsV1 for BufferParams {
Ok(())
}
#[tracing::instrument("debug", skip_all)]
async fn add(
&self,
_client: &mut Client,
@@ -89,6 +91,7 @@ impl ZwpLinuxBufferParamsV1 for BufferParams {
Ok(())
}
#[tracing::instrument("debug", skip_all)]
async fn create(
&self,
client: &mut Client,
@@ -123,6 +126,7 @@ impl ZwpLinuxBufferParamsV1 for BufferParams {
}
}
#[tracing::instrument("debug", skip_all)]
async fn create_immed(
&self,
client: &mut Client,
@@ -150,6 +154,7 @@ impl ZwpLinuxBufferParamsV1 for BufferParams {
}
impl Drop for BufferParams {
#[tracing::instrument("debug", skip_all)]
fn drop(&mut self) {
let planes = self.planes.get_mut();
tracing::info!("BufferParams being dropped with {} planes", planes.len());

7
src/wayland/dmabuf/feedback.rs
View File

@@ -19,8 +19,9 @@ use waynest::{
#[derive(Debug, Dispatcher)]
pub struct DmabufFeedback(pub Arc<Dmabuf>);
impl DmabufFeedback {
#[tracing::instrument("debug", skip_all)]
pub async fn send_params(&self, client: &mut Client, sender_id: ObjectId) -> Result<()> {
let num_formats = self.0.formats.len();
let num_formats = dbg!(self.0.formats.len());
// Send format table first
self.send_format_table(client, sender_id).await?;
@@ -44,7 +45,6 @@ impl DmabufFeedback {
self.tranche_target_device(client, sender_id, dev_id)
.await?;
// We only have one format at index 0
let indices = (0..num_formats).flat_map(|i| i.to_ne_bytes()).collect();
self.tranche_formats(client, sender_id, indices).await?;
@@ -60,6 +60,7 @@ impl DmabufFeedback {
Ok(())
}
#[tracing::instrument("debug", skip_all)]
pub async fn send_format_table(&self, client: &mut Client, sender_id: ObjectId) -> Result<()> {
// Format + modifier pair (16 bytes):
// - format: u32
@@ -74,7 +75,7 @@ impl DmabufFeedback {
mfd.as_file().set_len(size as u64)?;
for (format, modifier) in self.0.formats.iter() {
let format = format.clone() as u32;
let format = *format as u32;
// Write the format+modifier pair
mfd.as_file().write_all(&format.to_ne_bytes())?;
mfd.as_file().write_all(&0_u32.to_ne_bytes())?;

136
src/wayland/dmabuf/mod.rs
View File

@@ -2,15 +2,9 @@ pub mod buffer_backing;
pub mod buffer_params;
pub mod feedback;
use super::{
util::ClientExt,
vulkano_data::{DMA_CAPABLE_FORMATS, VULKANO_CONTEXT},
};
use super::{util::ClientExt, vulkano_data::VULKANO_CONTEXT};
use crate::core::registry::Registry;
use bevy_dmabuf::{
format_mapping::{drm_fourcc_to_vk_format, vk_format_to_drm_fourcc},
wgpu_init::vulkan_to_wgpu,
};
use bevy_dmabuf::{format_mapping::drm_fourcc_to_vk_format, wgpu_init::vulkan_to_wgpu};
use buffer_params::BufferParams;
use drm_fourcc::DrmFourcc;
use feedback::DmabufFeedback;
@@ -52,19 +46,16 @@ impl Dmabuf {
/// Create a new DMA-BUF interface instance
pub async fn new(client: &mut Client, id: ObjectId, version: u32) -> Result<Self> {
let vk = VULKANO_CONTEXT.wait();
let formats: FxHashSet<(DrmFourcc, u64)> = DMA_CAPABLE_FORMATS
let formats: FxHashSet<(DrmFourcc, u64)> = ALL_DRM_FOURCCS
.iter()
.filter(|f| {
vk_format_to_drm_fourcc((**f).into())
.and_then(drm_fourcc_to_vk_format)
.and_then(vulkan_to_wgpu)
.is_some()
})
.filter_map(|f| {
.copied()
.filter_map(|f| Some((f, drm_fourcc_to_vk_format(f)?)))
.filter(|(_, vk_format)| vulkan_to_wgpu(*vk_format).is_some())
.filter_map(|(f, vk_format)| {
Some((
vk_format_to_drm_fourcc((*f).into())?,
f,
vk.phys_dev
.format_properties(*f)
.format_properties(vk_format.try_into().unwrap())
.ok()?
.drm_format_modifier_properties
.into_iter()
@@ -78,7 +69,6 @@ impl Dmabuf {
dbg!(&formats);
let dmabuf = Self {
// formats: Mutex::new(formats),
active_params: Registry::new(),
version,
formats,
@@ -166,3 +156,111 @@ impl ZwpLinuxDmabufV1 for Dmabuf {
self.get_default_feedback(client, sender_id, id).await
}
}
pub const ALL_DRM_FOURCCS: [DrmFourcc; 105] = [
DrmFourcc::Abgr1555,
DrmFourcc::Abgr16161616f,
DrmFourcc::Abgr2101010,
DrmFourcc::Abgr4444,
DrmFourcc::Abgr8888,
DrmFourcc::Argb1555,
DrmFourcc::Argb16161616f,
DrmFourcc::Argb2101010,
DrmFourcc::Argb4444,
DrmFourcc::Argb8888,
DrmFourcc::Axbxgxrx106106106106,
DrmFourcc::Ayuv,
DrmFourcc::Bgr233,
DrmFourcc::Bgr565,
DrmFourcc::Bgr565_a8,
DrmFourcc::Bgr888,
DrmFourcc::Bgr888_a8,
DrmFourcc::Bgra1010102,
DrmFourcc::Bgra4444,
DrmFourcc::Bgra5551,
DrmFourcc::Bgra8888,
DrmFourcc::Bgrx1010102,
DrmFourcc::Bgrx4444,
DrmFourcc::Bgrx5551,
DrmFourcc::Bgrx8888,
DrmFourcc::Bgrx8888_a8,
DrmFourcc::Big_endian,
DrmFourcc::C8,
DrmFourcc::Gr1616,
DrmFourcc::Gr88,
DrmFourcc::Nv12,
DrmFourcc::Nv15,
DrmFourcc::Nv16,
DrmFourcc::Nv21,
DrmFourcc::Nv24,
DrmFourcc::Nv42,
DrmFourcc::Nv61,
DrmFourcc::P010,
DrmFourcc::P012,
DrmFourcc::P016,
DrmFourcc::P210,
DrmFourcc::Q401,
DrmFourcc::Q410,
DrmFourcc::R16,
DrmFourcc::R8,
DrmFourcc::Rg1616,
DrmFourcc::Rg88,
DrmFourcc::Rgb332,
DrmFourcc::Rgb565,
DrmFourcc::Rgb565_a8,
DrmFourcc::Rgb888,
DrmFourcc::Rgb888_a8,
DrmFourcc::Rgba1010102,
DrmFourcc::Rgba4444,
DrmFourcc::Rgba5551,
DrmFourcc::Rgba8888,
DrmFourcc::Rgbx1010102,
DrmFourcc::Rgbx4444,
DrmFourcc::Rgbx5551,
DrmFourcc::Rgbx8888,
DrmFourcc::Rgbx8888_a8,
DrmFourcc::Uyvy,
DrmFourcc::Vuy101010,
DrmFourcc::Vuy888,
DrmFourcc::Vyuy,
DrmFourcc::X0l0,
DrmFourcc::X0l2,
DrmFourcc::Xbgr1555,
DrmFourcc::Xbgr16161616f,
DrmFourcc::Xbgr2101010,
DrmFourcc::Xbgr4444,
DrmFourcc::Xbgr8888,
DrmFourcc::Xbgr8888_a8,
DrmFourcc::Xrgb1555,
DrmFourcc::Xrgb16161616f,
DrmFourcc::Xrgb2101010,
DrmFourcc::Xrgb4444,
DrmFourcc::Xrgb8888,
DrmFourcc::Xrgb8888_a8,
DrmFourcc::Xvyu12_16161616,
DrmFourcc::Xvyu16161616,
DrmFourcc::Xvyu2101010,
DrmFourcc::Xyuv8888,
DrmFourcc::Y0l0,
DrmFourcc::Y0l2,
DrmFourcc::Y210,
DrmFourcc::Y212,
DrmFourcc::Y216,
DrmFourcc::Y410,
DrmFourcc::Y412,
DrmFourcc::Y416,
DrmFourcc::Yuv410,
DrmFourcc::Yuv411,
DrmFourcc::Yuv420,
DrmFourcc::Yuv420_10bit,
DrmFourcc::Yuv420_8bit,
DrmFourcc::Yuv422,
DrmFourcc::Yuv444,
DrmFourcc::Yuyv,
DrmFourcc::Yvu410,
DrmFourcc::Yvu411,
DrmFourcc::Yvu420,
DrmFourcc::Yvu422,
DrmFourcc::Yvu444,
DrmFourcc::Yvyu,
];