diff --git a/src/backends/metal/video.rs b/src/backends/metal/video.rs index ea5df493..b33c9b0c 100644 --- a/src/backends/metal/video.rs +++ b/src/backends/metal/video.rs @@ -9,10 +9,14 @@ use { drm_feedback::DrmFeedback, edid::Descriptor, format::{Format, ARGB8888, XRGB8888}, - gfx_api::{BufferPoints, GfxApiOpt, GfxContext, GfxFramebuffer, GfxRenderPass, GfxTexture}, + gfx_api::{ + AbsoluteRect, BufferPoints, GfxApiOpt, GfxContext, GfxFramebuffer, GfxRenderPass, + GfxTexture, + }, ifs::wp_presentation_feedback::{KIND_HW_COMPLETION, KIND_VSYNC}, renderer::RenderResult, state::State, + theme::Color, tree::OutputNode, udev::UdevDevice, utils::{ @@ -345,6 +349,17 @@ pub struct DirectScanoutData { fb: Rc, dma_buf_id: DmaBufId, acquired: Cell, + position: DirectScanoutPosition, +} + +#[derive(Debug)] +pub struct DirectScanoutPosition { + pub src_width: i32, + pub src_height: i32, + pub crtc_x: i32, + pub crtc_y: i32, + pub crtc_width: i32, + pub crtc_height: i32, } impl Drop for DirectScanoutData { @@ -413,25 +428,96 @@ impl MetalConnector { pass: &GfxRenderPass, plane: &Rc, ) -> Option { - if pass.ops.len() != 1 { - return None; - } - let GfxApiOpt::CopyTexture(ct) = &pass.ops[0] else { - return None; + let plane_w = plane.mode_w.get(); + let plane_h = plane.mode_h.get(); + let ct = 'ct: { + let mut ops = pass.ops.iter().rev(); + let ct = 'ct2: { + for opt in &mut ops { + match opt { + GfxApiOpt::Sync => {} + GfxApiOpt::FillRect(_) => { + // Top-most layer must be a texture. + return None; + } + GfxApiOpt::CopyTexture(ct) => break 'ct2 ct, + } + } + return None; + }; + let plane_rect = AbsoluteRect { + x1: 0.0, + x2: plane_w as f32, + y1: 0.0, + y2: plane_h as f32, + }; + if !ct.tex.format().has_alpha && ct.target == plane_rect { + // Texture covers the entire screen and is opaque. + break 'ct ct; + } + for opt in ops { + match opt { + GfxApiOpt::Sync => {} + GfxApiOpt::FillRect(fr) => { + if fr.color == Color::SOLID_BLACK { + // Black fills can be ignored because this is the CRTC background color. + if fr.rect == plane_rect { + // If fill covers the entire screen, we don't have to look further. + break 'ct ct; + } + } else { + // Fill could be visible. + return None; + } + } + GfxApiOpt::CopyTexture(_) => { + // Texture could be visible. + return None; + } + } + } + if let Some(clear) = pass.clear { + if clear != Color::SOLID_BLACK { + // Background could be visible. + return None; + } + } + ct }; if ct.source != BufferPoints::identity() { + // Non-trivial transforms are not supported. return None; } - if ct.target.x1 != 0.0 - || ct.target.y1 != 0.0 - || ct.target.x2 != plane.mode_w.get() as f32 - || ct.target.y2 != plane.mode_h.get() as f32 + if ct.target.x1 < 0.0 + || ct.target.y1 < 0.0 + || ct.target.x2 > plane_w as f32 + || ct.target.y2 > plane_h as f32 { + // Rendering outside the screen is not supported. + return None; + } + let (tex_w, tex_h) = ct.tex.size(); + let (crtc_w, crtc_h) = (ct.target.x2 - ct.target.x1, ct.target.y2 - ct.target.y1); + if crtc_w < 0.0 || crtc_h < 0.0 { + // Flipping x or y axis is not supported. + return None; + } + if self.cursor_enabled.get() && (tex_w as f32, tex_h as f32) != (crtc_w, crtc_h) { + // If hardware cursors are used, we cannot scale the texture. return None; } let Some(dmabuf) = ct.tex.dmabuf() else { + // Shm buffers cannot be scanned out. return None; }; + let position = DirectScanoutPosition { + src_width: tex_w, + src_height: tex_h, + crtc_x: ct.target.x1 as _, + crtc_y: ct.target.y1 as _, + crtc_width: crtc_w as _, + crtc_height: crtc_h as _, + }; let mut cache = self.scanout_buffers.borrow_mut(); if let Some(buffer) = cache.get(&dmabuf.id) { return buffer.fb.as_ref().map(|fb| DirectScanoutData { @@ -439,12 +525,14 @@ impl MetalConnector { fb: fb.clone(), dma_buf_id: dmabuf.id, acquired: Default::default(), + position, }); } let format = 'format: { if let Some(f) = plane.formats.get(&dmabuf.format.drm) { break 'format f; } + // Try opaque format if possible. if let Some(opaque) = dmabuf.format.opaque { if let Some(f) = plane.formats.get(&opaque.drm) { break 'format f; @@ -461,6 +549,7 @@ impl MetalConnector { fb: Rc::new(fb), dma_buf_id: dmabuf.id, acquired: Default::default(), + position, }), Err(e) => { log::debug!( @@ -519,7 +608,14 @@ impl MetalConnector { let mut direct_scanout_data = None; if try_direct_scanout { if let Some(dsd) = self.prepare_direct_scanout(&pass, plane) { - output.perform_screencopies(None, &dsd.tex, !render_hw_cursor); + output.perform_screencopies( + None, + &dsd.tex, + !render_hw_cursor, + dsd.position.crtc_x, + dsd.position.crtc_y, + Some((dsd.position.crtc_width, dsd.position.crtc_height)), + ); direct_scanout_data = Some(dsd); } } @@ -542,6 +638,9 @@ impl MetalConnector { Some(&*buffer_fb), &buffer.render_tex, !render_hw_cursor, + 0, + 0, + None, ); buffer.drm.clone() } @@ -585,8 +684,33 @@ impl MetalConnector { let fb = self.prepare_present_fb(&mut rr, buffer, &plane, &node, try_direct_scanout); rr.dispatch_frame_requests(); + let (crtc_x, crtc_y, crtc_w, crtc_h, src_width, src_height) = + match &fb.direct_scanout_data { + None => { + let plane_w = plane.mode_w.get(); + let plane_h = plane.mode_h.get(); + (0, 0, plane_w, plane_h, plane_w, plane_h) + } + Some(dsd) => { + let p = &dsd.position; + ( + p.crtc_x, + p.crtc_y, + p.crtc_width, + p.crtc_height, + p.src_width, + p.src_height, + ) + } + }; changes.change_object(plane.id, |c| { c.change(plane.fb_id, fb.fb.id().0 as _); + c.change(plane.src_w.id, (src_width as u64) << 16); + c.change(plane.src_h.id, (src_height as u64) << 16); + c.change(plane.crtc_x.id, crtc_x as u64); + c.change(plane.crtc_y.id, crtc_y as u64); + c.change(plane.crtc_w.id, crtc_w as u64); + c.change(plane.crtc_h.id, crtc_h as u64); }); new_fb = Some(fb); } diff --git a/src/gfx_api.rs b/src/gfx_api.rs index b0725afc..26c3ae2f 100644 --- a/src/gfx_api.rs +++ b/src/gfx_api.rs @@ -112,7 +112,7 @@ impl BufferPoints { } } -#[derive(Debug)] +#[derive(Debug, PartialEq)] pub struct AbsoluteRect { pub x1: f32, pub x2: f32, @@ -385,6 +385,7 @@ pub trait GfxTexture: Debug { ) -> Result<(), GfxError>; fn dmabuf(&self) -> Option<&DmaBuf>; fn reservations(&self) -> &TextureReservations; + fn format(&self) -> &'static Format; } pub trait GfxContext: Debug { diff --git a/src/gfx_apis/gl/renderer/context.rs b/src/gfx_apis/gl/renderer/context.rs index 7e633d7e..b77cd4c1 100644 --- a/src/gfx_apis/gl/renderer/context.rs +++ b/src/gfx_apis/gl/renderer/context.rs @@ -187,6 +187,7 @@ impl GlRenderContext { ctx: self.clone(), gl, resv: Default::default(), + format, })) } } diff --git a/src/gfx_apis/gl/renderer/image.rs b/src/gfx_apis/gl/renderer/image.rs index c4a10b6b..50295260 100644 --- a/src/gfx_apis/gl/renderer/image.rs +++ b/src/gfx_apis/gl/renderer/image.rs @@ -29,6 +29,7 @@ impl Image { ctx: self.ctx.clone(), gl: GlTexture::import_img(&self.ctx.ctx, &self.gl)?, resv: Default::default(), + format: self.gl.dmabuf.format, })) } diff --git a/src/gfx_apis/gl/renderer/texture.rs b/src/gfx_apis/gl/renderer/texture.rs index d2f54f05..c2d479d5 100644 --- a/src/gfx_apis/gl/renderer/texture.rs +++ b/src/gfx_apis/gl/renderer/texture.rs @@ -17,6 +17,7 @@ pub struct Texture { pub(in crate::gfx_apis::gl) ctx: Rc, pub(in crate::gfx_apis::gl) gl: GlTexture, pub(in crate::gfx_apis::gl) resv: TextureReservations, + pub(in crate::gfx_apis::gl) format: &'static Format, } impl Debug for Texture { @@ -68,4 +69,8 @@ impl GfxTexture for Texture { fn reservations(&self) -> &TextureReservations { &self.resv } + + fn format(&self) -> &'static Format { + self.format + } } diff --git a/src/gfx_apis/vulkan/image.rs b/src/gfx_apis/vulkan/image.rs index 88b40025..6754133e 100644 --- a/src/gfx_apis/vulkan/image.rs +++ b/src/gfx_apis/vulkan/image.rs @@ -587,4 +587,8 @@ impl GfxTexture for VulkanImage { fn reservations(&self) -> &TextureReservations { &self.resv } + + fn format(&self) -> &'static Format { + self.format + } } diff --git a/src/ifs/jay_screencast.rs b/src/ifs/jay_screencast.rs index eea05d0c..dcd01b69 100644 --- a/src/ifs/jay_screencast.rs +++ b/src/ifs/jay_screencast.rs @@ -154,6 +154,9 @@ impl JayScreencast { on: &OutputNode, texture: &Rc, render_hardware_cursors: bool, + x_off: i32, + y_off: i32, + size: Option<(i32, i32)>, ) { if !self.running.get() { return; @@ -176,8 +179,9 @@ impl JayScreencast { on.global.preferred_scale.get(), on.global.pos.get(), render_hardware_cursors, - 0, - 0, + x_off, + y_off, + size, ); self.client.event(Ready { self_id: self.id, diff --git a/src/ifs/wl_output.rs b/src/ifs/wl_output.rs index f02f6b66..9c3d6d52 100644 --- a/src/ifs/wl_output.rs +++ b/src/ifs/wl_output.rs @@ -211,6 +211,9 @@ impl WlOutputGlobal { fb: Option<&dyn GfxFramebuffer>, tex: &Rc, render_hardware_cursors: bool, + x_off: i32, + y_off: i32, + size: Option<(i32, i32)>, ) { if self.pending_captures.is_empty() { return; @@ -295,8 +298,9 @@ impl WlOutputGlobal { self.preferred_scale.get(), self.pos.get(), render_hardware_cursors, - -capture.rect.x1(), - -capture.rect.y1(), + x_off - capture.rect.x1(), + y_off - capture.rect.y1(), + size, ); } if capture.with_damage.get() { diff --git a/src/state.rs b/src/state.rs index 62e15dda..7a4895ec 100644 --- a/src/state.rs +++ b/src/state.rs @@ -751,7 +751,7 @@ impl State { output.global.preferred_scale.get(), render_hw_cursor, ); - output.perform_screencopies(Some(&**fb), tex, !render_hw_cursor); + output.perform_screencopies(Some(&**fb), tex, !render_hw_cursor, 0, 0, None); rr.dispatch_frame_requests(); } @@ -764,6 +764,7 @@ impl State { render_hardware_cursors: bool, x_off: i32, y_off: i32, + size: Option<(i32, i32)>, ) { let mut ops = target.take_render_ops(); let (width, height) = target.size(); @@ -781,7 +782,7 @@ impl State { }; renderer .base - .render_texture(src, x_off, y_off, None, None, scale, None); + .render_texture(src, x_off, y_off, None, size, scale, None); if render_hardware_cursors { for seat in self.globals.lock_seats().values() { if let Some(cursor) = seat.get_cursor() { @@ -794,7 +795,6 @@ impl State { } } } - let clear = target.format().has_alpha.then_some(&Color::SOLID_BLACK); - target.render(ops, clear); + target.render(ops, Some(&Color::SOLID_BLACK)); } } diff --git a/src/tree/output.rs b/src/tree/output.rs index 3e286160..3c7e4f99 100644 --- a/src/tree/output.rs +++ b/src/tree/output.rs @@ -83,6 +83,9 @@ impl OutputNode { fb: Option<&dyn GfxFramebuffer>, tex: &Rc, render_hardware_cursor: bool, + x_off: i32, + y_off: i32, + size: Option<(i32, i32)>, ) { if let Some(workspace) = self.workspace.get() { if !workspace.capture.get() { @@ -90,9 +93,9 @@ impl OutputNode { } } self.global - .perform_screencopies(fb, tex, render_hardware_cursor); + .perform_screencopies(fb, tex, render_hardware_cursor, x_off, y_off, size); for sc in self.screencasts.lock().values() { - sc.copy_texture(self, tex, render_hardware_cursor); + sc.copy_texture(self, tex, render_hardware_cursor, x_off, y_off, size); } }