aboutsummaryrefslogtreecommitdiff
path: root/src/render_helpers/clipped_surface.rs
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2024-05-16 18:00:28 +0400
committerIvan Molodetskikh <yalterz@gmail.com>2024-05-16 18:00:28 +0400
commitae6377373787b59e1fcd4c2436ec4e04c066fa75 (patch)
treec045f0927fdcab6fea2bfca50c69529ff01705c5 /src/render_helpers/clipped_surface.rs
parentc5ca4128293b118ac0fd1e724a12bfe7de00097d (diff)
downloadniri-ae6377373787b59e1fcd4c2436ec4e04c066fa75.tar.gz
niri-ae6377373787b59e1fcd4c2436ec4e04c066fa75.tar.bz2
niri-ae6377373787b59e1fcd4c2436ec4e04c066fa75.zip
Update Smithay and other deps
Diffstat (limited to 'src/render_helpers/clipped_surface.rs')
-rw-r--r--src/render_helpers/clipped_surface.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/render_helpers/clipped_surface.rs b/src/render_helpers/clipped_surface.rs
index 43ba8594..72c497b2 100644
--- a/src/render_helpers/clipped_surface.rs
+++ b/src/render_helpers/clipped_surface.rs
@@ -5,7 +5,7 @@ use smithay::backend::renderer::element::{Element, Id, Kind, RenderElement, Unde
use smithay::backend::renderer::gles::{
GlesError, GlesFrame, GlesRenderer, GlesTexProgram, Uniform,
};
-use smithay::backend::renderer::utils::{CommitCounter, DamageSet};
+use smithay::backend::renderer::utils::{CommitCounter, DamageSet, OpaqueRegions};
use smithay::utils::{Buffer, Logical, Physical, Rectangle, Scale, Size, Transform};
use super::damage::ExtraDamage;
@@ -45,10 +45,10 @@ impl<R: NiriRenderer> ClippedSurfaceRenderElement<R> {
let geo_loc = Vec2::new(geo.loc.x, geo.loc.y);
let geo_size = Vec2::new(geo.size.w, geo.size.h);
- let buf_size = elem.buffer_size().unwrap();
+ let buf_size = elem.buffer_size();
let buf_size = Vec2::new(buf_size.w as f32, buf_size.h as f32);
- let view = elem.view().unwrap();
+ let view = elem.view();
let src_loc = Vec2::new(view.src.loc.x as f32, view.src.loc.y as f32);
let src_size = Vec2::new(view.src.size.w as f32, view.src.size.h as f32);
@@ -172,7 +172,7 @@ impl<R: NiriRenderer> Element for ClippedSurfaceRenderElement<R> {
.collect()
}
- fn opaque_regions(&self, scale: Scale<f64>) -> Vec<Rectangle<i32, Physical>> {
+ fn opaque_regions(&self, scale: Scale<f64>) -> OpaqueRegions<i32, Physical> {
let regions = self.inner.opaque_regions(scale);
// Intersect with geometry, since we're clipping by it.
@@ -195,7 +195,7 @@ impl<R: NiriRenderer> Element for ClippedSurfaceRenderElement<R> {
rect
});
- Rectangle::subtract_rects_many(regions, corners)
+ OpaqueRegions::from_slice(&Rectangle::subtract_rects_many(regions, corners))
}
}