fixup! WIP

pop-os · Dec 12, 2024 · 3b7796d · 3b7796d
1 parent 2a4b177
commit 3b7796d
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/src/backend/kms/mod.rs b/src/backend/kms/mod.rs
@@ -16,7 +16,7 @@ use smithay::{
             dmabuf::Dmabuf,
             gbm::{GbmAllocator, GbmBufferFlags},
         },
-        drm::{DrmDeviceFd, DrmNode, NodeType},
+        drm::{output::DrmOutputRenderElements, DrmDeviceFd, DrmNode, NodeType},
         egl::{context::ContextPriority, EGLContext, EGLDevice, EGLDisplay},
         input::InputEvent,
         libinput::{LibinputInputBackend, LibinputSessionInterface},
@@ -57,9 +57,7 @@ pub(crate) use surface::Surface;
 use device::*;
 pub use surface::Timings;
 
-use super::render::{
-    element::CosmicElement, init_shaders, output_elements, CursorMode, CLEAR_COLOR,
-};
+use super::render::{init_shaders, output_elements, CursorMode, CLEAR_COLOR};
 
 #[derive(Debug)]
 pub struct KmsState {
@@ -699,15 +697,14 @@ impl KmsState {
                                 planes.overlay = vec![];
                             }
 
-                            let mut builder = drm.initialize_output::<_, CosmicElement<_>>(*crtc);
-
                             let mut renderer = self
                                 .api
                                 .single_renderer(&device.render_node)
                                 .with_context(|| "Failed to create renderer")?;
 
+                            let mut elements = DrmOutputRenderElements::default();
                             for (crtc, output) in output_map.iter() {
-                                let elements = output_elements(
+                                let output_elements = output_elements(
                                     Some(&device.render_node),
                                     &mut renderer,
                                     &shell,
@@ -718,11 +715,19 @@ impl KmsState {
                                 )
                                 .with_context(|| "Failed to render outputs")?;
 
-                                builder.add_render_contents(crtc, CLEAR_COLOR, elements);
+                                elements.add_output(crtc, CLEAR_COLOR, output_elements);
                             }
 
-                            let compositor = builder
-                                .build(&mut renderer, *mode, &[conn], &surface.output, Some(planes))
+                            let compositor = drm
+                                .initialize_output(
+                                    *crtc,
+                                    *mode,
+                                    &[conn],
+                                    &surface.output,
+                                    Some(planes),
+                                    &mut renderer,
+                                    &elements,
+                                )
                                 .with_context(|| "Failed to create drm surface")?;
 
                             let _ = renderer;
@@ -774,15 +779,14 @@ impl KmsState {
                             }
                         }
 
-                        let mut builder = drm.use_mode(surface.crtc);
-
                         let mut renderer = self
                             .api
                             .single_renderer(&device.render_node)
                             .with_context(|| "Failed to create renderer")?;
 
+                        let mut elements = DrmOutputRenderElements::default();
                         for (crtc, output) in output_map.iter() {
-                            let elements = output_elements(
+                            let output_elements = output_elements(
                                 Some(&device.render_node),
                                 &mut renderer,
                                 &shell,
@@ -793,11 +797,10 @@ impl KmsState {
                             )
                             .with_context(|| "Failed to render outputs")?;
 
-                            builder.add_render_contents(crtc, CLEAR_COLOR, elements);
+                            elements.add_output(crtc, CLEAR_COLOR, output_elements);
                         }
 
-                        builder
-                            .commit(&mut renderer, *mode)
+                        drm.use_mode(&surface.crtc, *mode, &mut renderer, &elements)
                             .context("Failed to apply new mode")?;
                     }
                 }