From 0c805d9b30c02fc79d9586efac3d208135d7ec6a Mon Sep 17 00:00:00 2001 From: Victoria Brekenfeld Date: Thu, 11 Jun 2026 15:47:16 +0200 Subject: [PATCH] chore: cleanup new blur code --- src/backend/render/element.rs | 13 ++++--------- src/backend/render/wayland/blur_effect.rs | 6 +++--- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/backend/render/element.rs b/src/backend/render/element.rs index 706a542b..e1259dc1 100644 --- a/src/backend/render/element.rs +++ b/src/backend/render/element.rs @@ -11,27 +11,22 @@ use crate::{ use smithay::backend::renderer::element::texture::TextureRenderElement; use smithay::{ backend::{ - allocator::{Fourcc, dmabuf::Dmabuf}, + allocator::dmabuf::Dmabuf, drm::DrmDeviceFd, renderer::{ - Bind, Blit, ContextId, ExportMem, Frame as _, FrameContext, ImportAll, ImportMem, - Offscreen, Renderer, RendererSuper, + Bind, Blit, ContextId, ExportMem, ImportAll, ImportMem, Offscreen, Renderer, element::{ Element, Id, Kind, RenderElement, UnderlyingStorage, utils::{CropRenderElement, Relocate, RelocateRenderElement, RescaleRenderElement}, }, gles::{GlesError, GlesRenderbuffer, GlesTexture, element::TextureShaderElement}, glow::{GlowFrame, GlowRenderer}, - multigpu::{ - MultiTexture, - gbm::{GbmGlesBackend, GbmGlesDevice}, - }, + multigpu::MultiTexture, utils::{CommitCounter, DamageSet, OpaqueRegions}, }, }, utils::{ - Buffer as BufferCoords, Logical, Physical, Point, Rectangle, Scale, Size, - user_data::UserDataMap, + Buffer as BufferCoords, Logical, Physical, Point, Rectangle, Scale, user_data::UserDataMap, }, }; diff --git a/src/backend/render/wayland/blur_effect.rs b/src/backend/render/wayland/blur_effect.rs index 9b3145bc..3cf8ea9e 100644 --- a/src/backend/render/wayland/blur_effect.rs +++ b/src/backend/render/wayland/blur_effect.rs @@ -9,7 +9,7 @@ use smithay::{ allocator::Fourcc, renderer::{ Bind, BlitFrame, Color32F, ContextId, Frame, FrameContext, ImportAll, Offscreen, - Renderer, RendererSuper, Texture, TextureFilter, + Renderer, Texture, TextureFilter, element::{Element, Id, Kind, RenderElement}, gles::{ GlesError, GlesFrame, GlesRenderer, GlesTexProgram, GlesTexture, Uniform, @@ -115,7 +115,7 @@ impl BlurShaders { } } -type BlurTexture = Mutex>; +type BlurTexture = Mutex>; #[derive(Debug)] pub struct BlurState { @@ -473,7 +473,7 @@ where src, dst, &damage, - &opaque_regions, + opaque_regions, Transform::Normal, 1.0, )?;