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

Call underlying_storage of TextureRenderElement without mapping

Browse source 
This was mapping `UnderlyingStorage::Memory` to `None`. I don't see any
reason for this. Though this also shouldn't change behavior since
`TextureRenderElement` doesn't provide `underlying_storage` currently.
This commit is contained in:
Ian Douglas Scott 2024-12-09 15:00:06 -08:00 • committed by Victoria Brekenfeld
parent 29a649541d
commit b52d84dbd3
2 changed files with 23 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/backend/render/element.rs
View file

@ -217,36 +217,30 @@ where
RenderElement::<R>::draw(elem, frame, src, dst, damage, opaque_regions) RenderElement::<R>::draw(elem, frame, src, dst, damage, opaque_regions)
} }
CosmicElement::Mirror(elem) => { CosmicElement::Mirror(elem) => {
let elem = { let glow_frame = R::glow_frame_mut(frame);
let glow_frame = R::glow_frame_mut(frame); RenderElement::<GlowRenderer>::draw(
RenderElement::<GlowRenderer>::draw( elem,
elem, glow_frame,
glow_frame, src,
src, dst,
dst, damage,
damage, opaque_regions,
opaque_regions, )
) .map_err(FromGlesError::from_gles_error)
.map_err(FromGlesError::from_gles_error)
};
elem
} }
CosmicElement::Zoom(elem) => elem.draw(frame, src, dst, damage, opaque_regions), CosmicElement::Zoom(elem) => elem.draw(frame, src, dst, damage, opaque_regions),
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
CosmicElement::Egui(elem) => { CosmicElement::Egui(elem) => {
let elem = { let glow_frame = R::glow_frame_mut(frame);
let glow_frame = R::glow_frame_mut(frame); RenderElement::<GlowRenderer>::draw(
RenderElement::<GlowRenderer>::draw( elem,
elem, glow_frame,
glow_frame, src,
src, dst,
dst, damage,
damage, opaque_regions,
opaque_regions, )
) .map_err(FromGlesError::from_gles_error)
.map_err(FromGlesError::from_gles_error)
};
elem
} }
} }
} }
@ -260,23 +254,13 @@ where
CosmicElement::AdditionalDamage(elem) => elem.underlying_storage(renderer), CosmicElement::AdditionalDamage(elem) => elem.underlying_storage(renderer),
CosmicElement::Mirror(elem) => { CosmicElement::Mirror(elem) => {
let glow_renderer = renderer.glow_renderer_mut(); let glow_renderer = renderer.glow_renderer_mut();
match elem.underlying_storage(glow_renderer) { elem.underlying_storage(glow_renderer)
Some(UnderlyingStorage::Wayland(buffer)) => {
Some(UnderlyingStorage::Wayland(buffer))
}
_ => None,
}
} }
CosmicElement::Zoom(elem) => elem.underlying_storage(renderer), CosmicElement::Zoom(elem) => elem.underlying_storage(renderer),
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
CosmicElement::Egui(elem) => { CosmicElement::Egui(elem) => {
let glow_renderer = renderer.glow_renderer_mut(); let glow_renderer = renderer.glow_renderer_mut();
match elem.underlying_storage(glow_renderer) { elem.underlying_storage(glow_renderer)
Some(UnderlyingStorage::Wayland(buffer)) => {
Some(UnderlyingStorage::Wayland(buffer))
}
_ => None,
}
} }
} }
} }

7
src/shell/element/mod.rs
View file

@ -1371,12 +1371,7 @@ where
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
CosmicMappedRenderElement::Egui(elem) => { CosmicMappedRenderElement::Egui(elem) => {
let glow_renderer = renderer.glow_renderer_mut(); let glow_renderer = renderer.glow_renderer_mut();
match elem.underlying_storage(glow_renderer) { elem.underlying_storage(glow_renderer)
Some(UnderlyingStorage::Wayland(buffer)) => {
Some(UnderlyingStorage::Wayland(buffer))
}
_ => None,
}
} }
} }
} }