DrmOutputManager

.github/workflows/ci.yml

@@ -83,7 +83,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v3
       - name: Rust toolchain
-        uses: dtolnay/rust-toolchain@1.72.0
+        uses: dtolnay/rust-toolchain@1.80.1
       - name: Get date for registry cache
         id: date
         run: echo "::set-output name=date::$(date +'%Y-%m-%d')"

Cargo.toml

@@ -10,7 +10,7 @@ readme = "README.md"
 homepage = "https://smithay.github.io/"
 keywords = ["wayland", "compositor", "graphics", "server"]
 categories = ["gui"]
-rust-version = "1.72.0"
+rust-version = "1.80.1"
 
 [package.metadata.docs.rs]
 features = ["test_all_features"]
@@ -69,7 +69,7 @@ xkbcommon = { version = "0.8.0", features = ["wayland"]}
 encoding_rs = { version = "0.8.33", optional = true }
 profiling = "1.0.13"
 smallvec = "1.11"
-pixman = { version = "0.2.0", features = ["drm-fourcc", "sync"], optional = true }
+pixman = { version = "0.2.1", features = ["drm-fourcc", "sync"], optional = true }
 
 
 [dev-dependencies]

anvil/Cargo.toml

@@ -9,7 +9,7 @@ version = "0.0.1"
 [dependencies]
 bitflags = "2.2.1"
 fps_ticker = {version = "1.0.0", optional = true}
-image = {version = "0.25.1", default-features = false, optional = true}
+image = {version = "0.25.1", default-features = false, optional = true, features = ["png"]}
 rand = "0.8"
 tracing = { version = "0.1.37", features = ["max_level_trace", "release_max_level_debug"] }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }

anvil/src/drawing.rs

@@ -7,7 +7,7 @@ use smithay::{
             surface::WaylandSurfaceRenderElement,
             AsRenderElements, Kind,
         },
-        ImportAll, ImportMem, Renderer, Texture,
+        Color32F, ImportAll, ImportMem, Renderer, Texture,
     },
     input::pointer::CursorImageStatus,
     render_elements,
@@ -23,8 +23,8 @@ use smithay::{
     utils::{Buffer, Logical, Rectangle, Size, Transform},
 };
 
-pub static CLEAR_COLOR: [f32; 4] = [0.8, 0.8, 0.9, 1.0];
-pub static CLEAR_COLOR_FULLSCREEN: [f32; 4] = [0.0, 0.0, 0.0, 0.0];
+pub static CLEAR_COLOR: Color32F = Color32F::new(0.8, 0.8, 0.9, 1.0);
+pub static CLEAR_COLOR_FULLSCREEN: Color32F = Color32F::new(0.0, 0.0, 0.0, 0.0);
 
 pub struct PointerElement {
     buffer: Option<MemoryRenderBuffer>,

anvil/src/render.rs

@@ -9,7 +9,7 @@ use smithay::{
             },
             AsRenderElements, RenderElement, Wrap,
         },
-        ImportAll, ImportMem, Renderer,
+        Color32F, ImportAll, ImportMem, Renderer,
     },
     desktop::space::{
         constrain_space_element, ConstrainBehavior, ConstrainReference, Space, SpaceRenderElements,
@@ -142,7 +142,7 @@ pub fn output_elements<R>(
     custom_elements: impl IntoIterator<Item = CustomRenderElements<R>>,
     renderer: &mut R,
     show_window_preview: bool,
-) -> (Vec<OutputRenderElements<R, WindowRenderElement<R>>>, [f32; 4])
+) -> (Vec<OutputRenderElements<R, WindowRenderElement<R>>>, Color32F)
 where
     R: Renderer + ImportAll + ImportMem,
     R::TextureId: Clone + 'static,
@@ -198,7 +198,7 @@ pub fn render_output<'a, 'd, R>(
     damage_tracker: &'d mut OutputDamageTracker,
     age: usize,
     show_window_preview: bool,
-) -> Result<RenderOutputResult<'d>, OutputDamageTrackerError<R>>
+) -> Result<RenderOutputResult<'d>, OutputDamageTrackerError<R::Error>>
 where
     R: Renderer + ImportAll + ImportMem,
     R::TextureId: Clone + 'static,