leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "kms: Dmabuf Feedback support"

Browse source 
This reverts commit c8bb417d9b.
This commit is contained in:
Victoria Brekenfeld 2023-03-23 14:58:29 +01:00
parent 807291af19
commit 7ad37946d3
8 changed files with 26 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/shell/element/surface.rs
View file

@ -2,17 +2,13 @@ use std::time::Duration;
use smithay::{
backend::renderer::{
element::{
surface::WaylandSurfaceRenderElement, utils::select_dmabuf_feedback, AsRenderElements,
RenderElementStates,
},
element::{surface::WaylandSurfaceRenderElement, AsRenderElements},
ImportAll, Renderer,
},
desktop::{
utils::{
send_dmabuf_feedback_surface_tree, send_frames_surface_tree,
take_presentation_feedback_surface_tree, with_surfaces_surface_tree,
OutputPresentationFeedback,
send_frames_surface_tree, take_presentation_feedback_surface_tree,
with_surfaces_surface_tree, OutputPresentationFeedback,
},
Window,
},
@ -38,8 +34,6 @@ use smithay::{
xwayland::{xwm::X11Relatable, X11Surface},
};
use crate::state::SurfaceDmabufFeedback;
space_elements! {
#[derive(Debug, Clone, PartialEq)]
pub CosmicSurface;
@ -375,7 +369,7 @@ impl CosmicSurface {
{
match self {
CosmicSurface::Wayland(window) => {
window.send_frame(output, time, throttle, primary_scan_out_output);
window.send_frame(output, time, throttle, primary_scan_out_output)
}
CosmicSurface::X11(surface) => {
if let Some(wl_surface) = surface.wl_surface() {
@ -392,47 +386,6 @@ impl CosmicSurface {
}
}
pub fn send_dmabuf_feedback<F1>(
&self,
output: &Output,
feedback: &SurfaceDmabufFeedback,
render_element_states: &RenderElementStates,
primary_scan_out_output: F1,
) where
F1: FnMut(&WlSurface, &SurfaceData) -> Option<Output> + Copy,
{
match self {
CosmicSurface::Wayland(window) => {
window.send_dmabuf_feedback(output, primary_scan_out_output, |surface, _| {
select_dmabuf_feedback(
surface,
render_element_states,
&feedback.render_feedback,
&feedback.scanout_feedback,
)
})
}
CosmicSurface::X11(surface) => {
if let Some(wl_surface) = surface.wl_surface() {
send_dmabuf_feedback_surface_tree(
&wl_surface,
output,
primary_scan_out_output,
|surface, _| {
select_dmabuf_feedback(
surface,
render_element_states,
&feedback.render_feedback,
&feedback.scanout_feedback,
)
},
)
}
}
_ => unreachable!(),
}
}
pub fn take_presentation_feedback<F1, F2>(
&self,
output_feedback: &mut OutputPresentationFeedback,

18
src/shell/layout/floating/grabs/moving.rs
View file

@ -6,13 +6,12 @@ use crate::{
element::{window::CosmicWindowRenderElement, CosmicMapped, CosmicMappedRenderElement},
focus::target::{KeyboardFocusTarget, PointerFocusTarget},
},
state::SurfaceDmabufFeedback,
utils::prelude::*,
};
use smithay::{
backend::renderer::{
element::{AsRenderElements, RenderElement, RenderElementStates},
element::{AsRenderElements, RenderElement},
ImportAll, ImportMem, Renderer,
},
desktop::space::SpaceElement,
@ -92,21 +91,6 @@ impl MoveGrabState {
.active_window()
.send_frame(output, time, throttle, primary_scan_out_output)
}
pub fn send_dmabuf_feedback(
&self,
output: &Output,
feedback: &SurfaceDmabufFeedback,
render_element_states: &RenderElementStates,
primary_scan_out_output: impl FnMut(&WlSurface, &SurfaceData) -> Option<Output> + Copy,
) {
self.window.active_window().send_dmabuf_feedback(
output,
feedback,
render_element_states,
primary_scan_out_output,
)
}
}
pub struct MoveSurfaceGrab {