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

Revert "Move some trait bounds to definition of AsGlowRenderer"

Browse source 
This reverts commit c860fcddad.

Accidentally pushed to wrong branch.

If only branch protection has a way to prompt for overriding rule on
push...
This commit is contained in:
Ian Douglas Scott 2026-03-11 20:08:33 -07:00
parent 87a7d20b33
commit 0d6c83db31
9 changed files with 93 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ use smithay::{
backend::{
input::KeyState,
renderer::{
ImportAll, ImportMem, Renderer,
element::{
Element, RenderElement, UnderlyingStorage,
memory::MemoryRenderBufferRenderElement,
@ -570,7 +571,7 @@ impl CosmicMapped {
alpha: f32,
) -> Vec<C>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
C: From<CosmicMappedRenderElement<R>>,
@ -601,7 +602,7 @@ impl CosmicMapped {
alpha: f32,
) -> Option<C>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
C: From<CosmicMappedRenderElement<R>>,
@ -645,7 +646,7 @@ impl CosmicMapped {
scanout_override: Option<bool>,
) -> Vec<C>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
C: From<CosmicMappedRenderElement<R>>,
@ -1060,7 +1061,7 @@ impl From<CosmicStack> for CosmicMapped {
pub enum CosmicMappedRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + AsGlowRenderer + ImportAll + ImportMem,
R::TextureId: 'static,
{
Stack(self::stack::CosmicStackRenderElement<R>),
@ -1095,7 +1096,7 @@ where
impl<R> Element for CosmicMappedRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + AsGlowRenderer + ImportAll + ImportMem,
R::TextureId: 'static,
{
fn id(&self) -> &smithay::backend::renderer::element::Id {
@ -1278,7 +1279,7 @@ where
impl<R> RenderElement<R> for CosmicMappedRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
R::Error: FromGlesError,
{
@ -1394,7 +1395,7 @@ where
impl<R> From<stack::CosmicStackRenderElement<R>> for CosmicMappedRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
@ -1404,7 +1405,7 @@ where
}
impl<R> From<window::CosmicWindowRenderElement<R>> for CosmicMappedRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
@ -1415,7 +1416,7 @@ where
impl<R> From<PixelShaderElement> for CosmicMappedRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
@ -1426,7 +1427,7 @@ where
impl<R> From<MemoryRenderBufferRenderElement<R>> for CosmicMappedRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
@ -1438,7 +1439,7 @@ where
#[cfg(feature = "debug")]
impl<R> From<TextureRenderElement<GlesTexture>> for CosmicMappedRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{

8
src/shell/element/stack.rs
View file

@ -637,7 +637,7 @@ impl CosmicStack {
alpha: f32,
) -> Vec<C>
where
R: AsGlowRenderer,
R: Renderer + AsGlowRenderer + ImportAll + ImportMem,
R::TextureId: Send + Clone + 'static,
C: From<CosmicStackRenderElement<R>>,
{
@ -666,7 +666,7 @@ impl CosmicStack {
alpha: f32,
) -> Option<C>
where
R: AsGlowRenderer,
R: Renderer + AsGlowRenderer + ImportAll + ImportMem,
R::TextureId: Send + Clone + 'static,
C: From<CosmicStackRenderElement<R>>,
{
@ -733,7 +733,7 @@ impl CosmicStack {
scanout_override: Option<bool>,
) -> Vec<C>
where
R: AsGlowRenderer,
R: Renderer + AsGlowRenderer + ImportAll + ImportMem,
R::TextureId: Send + Clone + 'static,
C: From<CosmicStackRenderElement<R>>,
{
@ -1995,7 +1995,7 @@ where
impl<R> RenderElement<R> for CosmicStackRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + AsGlowRenderer + ImportAll + ImportMem,
R::TextureId: 'static,
R::Error: FromGlesError,
{

6
src/shell/element/window.rs
View file

@ -364,7 +364,7 @@ impl CosmicWindow {
alpha: f32,
) -> Option<C>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
C: From<CosmicWindowRenderElement<R>>,
{
@ -444,7 +444,7 @@ impl CosmicWindow {
scanout_override: Option<bool>,
) -> Vec<C>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
C: From<CosmicWindowRenderElement<R>>,
{
@ -1350,7 +1350,7 @@ where
impl<R> RenderElement<R> for CosmicWindowRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + AsGlowRenderer + ImportAll + ImportMem,
R::TextureId: 'static,
R::Error: FromGlesError,
{

13
src/shell/layout/floating/mod.rs
View file

@ -10,9 +10,12 @@ use cosmic_comp_config::AppearanceConfig;
use cosmic_settings_config::shortcuts::action::ResizeDirection;
use keyframe::{ease, functions::EaseInOutCubic};
use smithay::{
backend::renderer::element::{
AsRenderElements, RenderElement,
utils::{Relocate, RelocateRenderElement, RescaleRenderElement},
backend::renderer::{
ImportAll, ImportMem, Renderer,
element::{
AsRenderElements, RenderElement,
utils::{Relocate, RelocateRenderElement, RescaleRenderElement},
},
},
desktop::{PopupKind, Space, WindowSurfaceType, layer_map_for_output, space::SpaceElement},
input::Seat,
@ -1418,7 +1421,7 @@ impl FloatingLayout {
alpha: f32,
) -> Vec<CosmicMappedRenderElement<R>>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,
@ -1469,7 +1472,7 @@ impl FloatingLayout {
theme: &cosmic::theme::CosmicTheme,
) -> Vec<CosmicMappedRenderElement<R>>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,

15
src/shell/layout/tiling/mod.rs
View file

@ -47,6 +47,7 @@ use keyframe::{
};
use smithay::{
backend::renderer::{
ImportAll, ImportMem, Renderer,
element::{
AsRenderElements, Id, RenderElement,
utils::{
@ -4010,7 +4011,7 @@ impl TilingLayout {
theme: &cosmic::theme::CosmicTheme,
) -> Result<Vec<CosmicMappedRenderElement<R>>, OutputNotMapped>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,
@ -4170,7 +4171,7 @@ impl TilingLayout {
theme: &cosmic::theme::CosmicTheme,
) -> Result<Vec<CosmicMappedRenderElement<R>>, OutputNotMapped>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,
@ -4344,7 +4345,7 @@ fn geometries_for_groupview<'a, R>(
Vec<CosmicMappedRenderElement<R>>,
)
where
R: AsGlowRenderer + 'a,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer + 'a,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,
@ -4976,7 +4977,7 @@ fn render_old_tree_popups<R>(
is_swap_mode: bool,
) -> Vec<CosmicMappedRenderElement<R>>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,
@ -5019,7 +5020,7 @@ fn render_old_tree_windows<R>(
theme: &cosmic::theme::CosmicTheme,
) -> Vec<CosmicMappedRenderElement<R>>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,
@ -5202,7 +5203,7 @@ fn render_new_tree_popups<R>(
swap_desc: Option<NodeDesc>,
) -> Vec<CosmicMappedRenderElement<R>>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,
@ -5268,7 +5269,7 @@ fn render_new_tree_windows<R>(
theme: &cosmic::theme::CosmicTheme,
) -> Vec<CosmicMappedRenderElement<R>>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,

21
src/shell/workspace.rs
View file

@ -34,6 +34,7 @@ use keyframe::{ease, functions::EaseInOutCubic};
use smithay::output::WeakOutput;
use smithay::{
backend::renderer::{
ImportAll, ImportMem, Renderer,
element::{
Element, Id, RenderElement, surface::WaylandSurfaceRenderElement,
texture::TextureRenderElement, utils::RescaleRenderElement,
@ -1517,7 +1518,7 @@ impl Workspace {
theme: &CosmicTheme,
) -> Result<Vec<WorkspaceRenderElement<R>>, OutputNotMapped>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,
@ -1719,7 +1720,7 @@ impl Workspace {
theme: &CosmicTheme,
) -> Result<Vec<WorkspaceRenderElement<R>>, OutputNotMapped>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: Send + Clone + 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
CosmicWindowRenderElement<R>: RenderElement<R>,
@ -1859,7 +1860,7 @@ pub struct OutputNotMapped;
pub enum WorkspaceRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
{
OverrideRedirect(WaylandSurfaceRenderElement<R>),
@ -1871,7 +1872,7 @@ where
impl<R> Element for WorkspaceRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
{
fn id(&self) -> &smithay::backend::renderer::element::Id {
@ -1971,7 +1972,7 @@ where
impl<R> RenderElement<R> for WorkspaceRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
R::Error: FromGlesError,
{
@ -2026,7 +2027,7 @@ where
impl<R> From<RescaleRenderElement<CosmicWindowRenderElement<R>>> for WorkspaceRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
@ -2037,7 +2038,7 @@ where
impl<R> From<CosmicWindowRenderElement<R>> for WorkspaceRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
@ -2048,7 +2049,7 @@ where
impl<R> From<WaylandSurfaceRenderElement<R>> for WorkspaceRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
@ -2059,7 +2060,7 @@ where
impl<R> From<CosmicMappedRenderElement<R>> for WorkspaceRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{
@ -2070,7 +2071,7 @@ where
impl<R> From<TextureRenderElement<GlesTexture>> for WorkspaceRenderElement<R>
where
R: AsGlowRenderer,
R: Renderer + ImportAll + ImportMem + AsGlowRenderer,
R::TextureId: 'static,
CosmicMappedRenderElement<R>: RenderElement<R>,
{