aboutsummaryrefslogtreecommitdiff
path: root/src/render_helpers
diff options
context:
space:
mode:
Diffstat (limited to 'src/render_helpers')
-rw-r--r--src/render_helpers/clipped_surface.rs24
-rw-r--r--src/render_helpers/damage.rs2
-rw-r--r--src/render_helpers/mod.rs4
-rw-r--r--src/render_helpers/resize.rs2
-rw-r--r--src/render_helpers/shader_element.rs8
-rw-r--r--src/render_helpers/solid_color.rs7
-rw-r--r--src/render_helpers/texture.rs6
7 files changed, 25 insertions, 28 deletions
diff --git a/src/render_helpers/clipped_surface.rs b/src/render_helpers/clipped_surface.rs
index f8d4e3aa..34f6c5b4 100644
--- a/src/render_helpers/clipped_surface.rs
+++ b/src/render_helpers/clipped_surface.rs
@@ -6,7 +6,7 @@ use smithay::backend::renderer::gles::{
GlesError, GlesFrame, GlesRenderer, GlesTexProgram, Uniform,
};
use smithay::backend::renderer::utils::{CommitCounter, DamageSet, OpaqueRegions};
-use smithay::utils::{Buffer, Logical, Physical, Rectangle, Scale, Size, Transform};
+use smithay::utils::{Buffer, Logical, Physical, Point, Rectangle, Scale, Size, Transform};
use super::damage::ExtraDamage;
use super::renderer::{AsGlesFrame as _, NiriRenderer};
@@ -117,21 +117,21 @@ impl<R: NiriRenderer> ClippedSurfaceRenderElement<R> {
let bottom_left = corner_radius.bottom_left as f64;
[
- Rectangle::from_loc_and_size(geo.loc, (top_left, top_left)),
- Rectangle::from_loc_and_size(
- (geo.loc.x + geo.size.w - top_right, geo.loc.y),
- (top_right, top_right),
+ Rectangle::new(geo.loc, Size::from((top_left, top_left))),
+ Rectangle::new(
+ Point::from((geo.loc.x + geo.size.w - top_right, geo.loc.y)),
+ Size::from((top_right, top_right)),
),
- Rectangle::from_loc_and_size(
- (
+ Rectangle::new(
+ Point::from((
geo.loc.x + geo.size.w - bottom_right,
geo.loc.y + geo.size.h - bottom_right,
- ),
- (bottom_right, bottom_right),
+ )),
+ Size::from((bottom_right, bottom_right)),
),
- Rectangle::from_loc_and_size(
- (geo.loc.x, geo.loc.y + geo.size.h - bottom_left),
- (bottom_left, bottom_left),
+ Rectangle::new(
+ Point::from((geo.loc.x, geo.loc.y + geo.size.h - bottom_left)),
+ Size::from((bottom_left, bottom_left)),
),
]
}
diff --git a/src/render_helpers/damage.rs b/src/render_helpers/damage.rs
index e05ee649..328851e8 100644
--- a/src/render_helpers/damage.rs
+++ b/src/render_helpers/damage.rs
@@ -54,7 +54,7 @@ impl Element for ExtraDamage {
}
fn src(&self) -> Rectangle<f64, Buffer> {
- Rectangle::from_loc_and_size((0., 0.), (1., 1.))
+ Rectangle::from_size(Size::from((1., 1.)))
}
fn geometry(&self, scale: Scale<f64>) -> Rectangle<i32, Physical> {
diff --git a/src/render_helpers/mod.rs b/src/render_helpers/mod.rs
index 32a571c9..98ccf19e 100644
--- a/src/render_helpers/mod.rs
+++ b/src/render_helpers/mod.rs
@@ -216,7 +216,7 @@ pub fn render_and_download(
let buffer_size = size.to_logical(1).to_buffer(1, Transform::Normal);
let mapping = renderer
- .copy_framebuffer(Rectangle::from_loc_and_size((0, 0), buffer_size), fourcc)
+ .copy_framebuffer(Rectangle::from_size(buffer_size), fourcc)
.context("error copying framebuffer")?;
Ok(mapping)
}
@@ -300,7 +300,7 @@ fn render_elements(
elements: impl Iterator<Item = impl RenderElement<GlesRenderer>>,
) -> anyhow::Result<SyncPoint> {
let transform = transform.invert();
- let output_rect = Rectangle::from_loc_and_size((0, 0), transform.transform_size(size));
+ let output_rect = Rectangle::from_size(transform.transform_size(size));
let mut frame = renderer
.render(size, transform)
diff --git a/src/render_helpers/resize.rs b/src/render_helpers/resize.rs
index 8eed17e5..f8cbadda 100644
--- a/src/render_helpers/resize.rs
+++ b/src/render_helpers/resize.rs
@@ -43,7 +43,7 @@ impl ResizeRenderElement {
let tex_next_geo_scaled = tex_next_geo.to_f64().upscale(scale_next);
let combined_geo = tex_prev_geo_scaled.merge(tex_next_geo_scaled).to_i32_up();
- let area = Rectangle::from_loc_and_size(
+ let area = Rectangle::new(
area.loc + combined_geo.loc.to_logical(scale),
combined_geo.size.to_logical(scale),
);
diff --git a/src/render_helpers/shader_element.rs b/src/render_helpers/shader_element.rs
index e683154e..4f5163d9 100644
--- a/src/render_helpers/shader_element.rs
+++ b/src/render_helpers/shader_element.rs
@@ -193,7 +193,7 @@ impl ShaderRenderElement {
program,
id: Id::new(),
commit_counter: CommitCounter::default(),
- area: Rectangle::from_loc_and_size((0., 0.), size),
+ area: Rectangle::from_size(size),
opaque_regions: opaque_regions.unwrap_or_default(),
scale,
alpha,
@@ -255,7 +255,7 @@ impl Element for ShaderRenderElement {
}
fn src(&self) -> Rectangle<f64, Buffer> {
- Rectangle::from_loc_and_size((0., 0.), (1., 1.))
+ Rectangle::from_size(Size::from((1., 1.)))
}
fn geometry(&self, scale: Scale<f64>) -> Rectangle<i32, Physical> {
@@ -314,7 +314,7 @@ impl RenderElement<GlesRenderer> for ShaderRenderElement {
(dest_size.to_point() - rect_constrained_loc).to_size(),
);
- let rect = Rectangle::from_loc_and_size(rect_constrained_loc, rect_clamped_size);
+ let rect = Rectangle::new(rect_constrained_loc, rect_clamped_size);
[
rect.loc.x as f32,
rect.loc.y as f32,
@@ -334,7 +334,7 @@ impl RenderElement<GlesRenderer> for ShaderRenderElement {
(dest_size.to_point() - rect_constrained_loc).to_size(),
);
- let rect = Rectangle::from_loc_and_size(rect_constrained_loc, rect_clamped_size);
+ let rect = Rectangle::new(rect_constrained_loc, rect_clamped_size);
// Add the 4 f32s per damage rectangle for each of the 6 vertices.
(0..6).flat_map(move |_| {
[
diff --git a/src/render_helpers/solid_color.rs b/src/render_helpers/solid_color.rs
index cdda19c8..5dfb5843 100644
--- a/src/render_helpers/solid_color.rs
+++ b/src/render_helpers/solid_color.rs
@@ -85,7 +85,7 @@ impl SolidColorRenderElement {
alpha: f32,
kind: Kind,
) -> Self {
- let geo = Rectangle::from_loc_and_size(location, buffer.size());
+ let geo = Rectangle::new(location.into(), buffer.size());
let color = buffer.color * alpha;
Self::new(buffer.id.clone(), geo, buffer.commit, color, kind)
}
@@ -125,7 +125,7 @@ impl Element for SolidColorRenderElement {
}
fn src(&self) -> Rectangle<f64, Buffer> {
- Rectangle::from_loc_and_size((0., 0.), (1., 1.))
+ Rectangle::from_size(Size::from((1., 1.)))
}
fn geometry(&self, scale: Scale<f64>) -> Rectangle<i32, Physical> {
@@ -134,8 +134,7 @@ impl Element for SolidColorRenderElement {
fn opaque_regions(&self, scale: Scale<f64>) -> OpaqueRegions<i32, Physical> {
if self.color.is_opaque() {
- let rect = Rectangle::from_loc_and_size((0., 0.), self.geometry.size)
- .to_physical_precise_down(scale);
+ let rect = Rectangle::from_size(self.geometry.size).to_physical_precise_down(scale);
OpaqueRegions::from_slice(&[rect])
} else {
OpaqueRegions::default()
diff --git a/src/render_helpers/texture.rs b/src/render_helpers/texture.rs
index b7b45c65..8273c6f6 100644
--- a/src/render_helpers/texture.rs
+++ b/src/render_helpers/texture.rs
@@ -157,7 +157,7 @@ impl<T: Texture> Element for TextureRenderElement<T> {
}
fn geometry(&self, scale: Scale<f64>) -> Rectangle<i32, Physical> {
- let logical_geo = Rectangle::from_loc_and_size(self.location, self.logical_size());
+ let logical_geo = Rectangle::new(self.location, self.logical_size());
logical_geo.to_physical_precise_round(scale)
}
@@ -174,9 +174,7 @@ impl<T: Texture> Element for TextureRenderElement<T> {
&self.buffer.logical_size(),
)
})
- .unwrap_or_else(|| {
- Rectangle::from_loc_and_size((0, 0), self.buffer.texture.size()).to_f64()
- })
+ .unwrap_or_else(|| Rectangle::from_size(self.buffer.texture.size()).to_f64())
}
fn opaque_regions(&self, scale: Scale<f64>) -> OpaqueRegions<i32, Physical> {
generated by cgit (git 2.34.1) at 2026-02-08 20:38:36 +0000