From 7aab41304860a7b3a5db89d3dd0657e7d4f89989 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sat, 4 May 2024 09:15:17 +0400
Subject: shader_element: Remove size

It's not actually needed.
---
 src/render_helpers/border.rs         |  3 +--
 src/render_helpers/resize.rs         |  6 ------
 src/render_helpers/shader_element.rs | 14 ++------------
 3 files changed, 3 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/render_helpers/border.rs b/src/render_helpers/border.rs
index 81a9a885..55df4d46 100644
--- a/src/render_helpers/border.rs
+++ b/src/render_helpers/border.rs
@@ -5,7 +5,7 @@ use niri_config::CornerRadius;
 use smithay::backend::renderer::element::{Element, Id, Kind, RenderElement, UnderlyingStorage};
 use smithay::backend::renderer::gles::{GlesError, GlesFrame, GlesRenderer, Uniform};
 use smithay::backend::renderer::utils::{CommitCounter, DamageSet};
-use smithay::utils::{Buffer, Logical, Physical, Rectangle, Scale, Size, Transform};
+use smithay::utils::{Buffer, Logical, Physical, Rectangle, Scale, Transform};
 
 use super::renderer::NiriRenderer;
 use super::shader_element::ShaderRenderElement;
@@ -157,7 +157,6 @@ impl BorderRenderElement {
 
         self.inner.update(
             area,
-            Size::from((1., 1.)),
             None,
             vec![
                 Uniform::new("color_from", color_from),
diff --git a/src/render_helpers/resize.rs b/src/render_helpers/resize.rs
index 021c59bc..7eaec7e4 100644
--- a/src/render_helpers/resize.rs
+++ b/src/render_helpers/resize.rs
@@ -43,11 +43,6 @@ 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);
 
-        let size = combined_geo
-            .size
-            .to_logical(1.)
-            .to_buffer(1., Transform::Normal);
-
         let area = Rectangle::from_loc_and_size(
             area.loc + combined_geo.loc.to_logical(scale).to_i32_round(),
             combined_geo.size.to_logical(scale).to_i32_round(),
@@ -93,7 +88,6 @@ impl ResizeRenderElement {
         Self(ShaderRenderElement::new(
             ProgramType::Resize,
             area,
-            size,
             None,
             result_alpha,
             vec![
diff --git a/src/render_helpers/shader_element.rs b/src/render_helpers/shader_element.rs
index 4b4af625..27e8a6b7 100644
--- a/src/render_helpers/shader_element.rs
+++ b/src/render_helpers/shader_element.rs
@@ -10,7 +10,7 @@ use smithay::backend::renderer::gles::{
 };
 use smithay::backend::renderer::utils::CommitCounter;
 use smithay::backend::renderer::DebugFlags;
-use smithay::utils::{Buffer, Logical, Physical, Rectangle, Scale, Size};
+use smithay::utils::{Buffer, Logical, Physical, Rectangle, Scale};
 
 use super::renderer::AsGlesFrame;
 use super::resources::Resources;
@@ -24,7 +24,6 @@ pub struct ShaderRenderElement {
     id: Id,
     commit_counter: CommitCounter,
     area: Rectangle<i32, Logical>,
-    size: Size<f64, Buffer>,
     opaque_regions: Vec<Rectangle<i32, Logical>>,
     alpha: f32,
     additional_uniforms: Vec<Uniform<'static>>,
@@ -200,7 +199,6 @@ impl ShaderRenderElement {
     pub fn new(
         program: ProgramType,
         area: Rectangle<i32, Logical>,
-        size: Size<f64, Buffer>,
         opaque_regions: Option<Vec<Rectangle<i32, Logical>>>,
         alpha: f32,
         uniforms: Vec<Uniform<'_>>,
@@ -212,7 +210,6 @@ impl ShaderRenderElement {
             id: Id::new(),
             commit_counter: CommitCounter::default(),
             area,
-            size,
             opaque_regions: opaque_regions.unwrap_or_default(),
             alpha,
             additional_uniforms: uniforms.into_iter().map(|u| u.into_owned()).collect(),
@@ -227,7 +224,6 @@ impl ShaderRenderElement {
             id: Id::new(),
             commit_counter: CommitCounter::default(),
             area: Rectangle::default(),
-            size: Size::default(),
             opaque_regions: vec![],
             alpha: 1.,
             additional_uniforms: vec![],
@@ -243,13 +239,11 @@ impl ShaderRenderElement {
     pub fn update(
         &mut self,
         area: Rectangle<i32, Logical>,
-        size: Size<f64, Buffer>,
         opaque_regions: Option<Vec<Rectangle<i32, Logical>>>,
         uniforms: Vec<Uniform<'_>>,
         textures: HashMap<String, GlesTexture>,
     ) {
         self.area = area;
-        self.size = size;
         self.opaque_regions = opaque_regions.unwrap_or_default();
         self.additional_uniforms = uniforms.into_iter().map(|u| u.into_owned()).collect();
         self.textures = textures;
@@ -268,7 +262,7 @@ impl Element for ShaderRenderElement {
     }
 
     fn src(&self) -> Rectangle<f64, Buffer> {
-        Rectangle::from_loc_and_size((0., 0.), self.size.to_f64())
+        Rectangle::from_loc_and_size((0., 0.), (1., 1.))
     }
 
     fn geometry(&self, scale: Scale<f64>) -> Rectangle<i32, Physical> {
@@ -370,10 +364,6 @@ impl RenderElement<GlesRenderer> for ShaderRenderElement {
         let tex_matrix = Mat3::from_scale(Vec2::new(scale.x as f32, scale.y as f32));
         let tex_matrix =
             Mat3::from_translation(Vec2::new(src.loc.x as f32, src.loc.y as f32)) * tex_matrix;
-        let tex_matrix = Mat3::from_scale(Vec2::new(
-            (1.0f64 / self.size.w) as f32,
-            (1.0f64 / self.size.h) as f32,
-        )) * tex_matrix;
 
         //apply output transformation
         matrix = Mat3::from_cols_array(frame.projection()) * matrix;
-- 
cgit