From 8ab50f9d1ca5795f4eef84ad423dc0d63d990b98 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 3 May 2024 21:21:58 +0400 Subject: shader_element: Store program type instead of shader --- src/render_helpers/resize.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/render_helpers/resize.rs') diff --git a/src/render_helpers/resize.rs b/src/render_helpers/resize.rs index c728689a..021c59bc 100644 --- a/src/render_helpers/resize.rs +++ b/src/render_helpers/resize.rs @@ -8,8 +8,8 @@ use smithay::backend::renderer::utils::{CommitCounter, DamageSet}; use smithay::utils::{Buffer, Logical, Physical, Rectangle, Scale, Size, Transform}; use super::renderer::{AsGlesFrame, NiriRenderer}; -use super::shader_element::{ShaderProgram, ShaderRenderElement}; -use super::shaders::{mat3_uniform, Shaders}; +use super::shader_element::ShaderRenderElement; +use super::shaders::{mat3_uniform, ProgramType, Shaders}; use crate::backend::tty::{TtyFrame, TtyRenderer, TtyRendererError}; #[derive(Debug)] @@ -18,7 +18,6 @@ pub struct ResizeRenderElement(ShaderRenderElement); impl ResizeRenderElement { #[allow(clippy::too_many_arguments)] pub fn new( - shader: ShaderProgram, area: Rectangle, scale: Scale, texture_prev: (GlesTexture, Rectangle), @@ -92,7 +91,7 @@ impl ResizeRenderElement { // Create the shader. Self(ShaderRenderElement::new( - Some(shader), + ProgramType::Resize, area, size, None, @@ -117,8 +116,10 @@ impl ResizeRenderElement { )) } - pub fn shader(renderer: &mut impl NiriRenderer) -> Option { - Shaders::get(renderer).resize() + pub fn has_shader(renderer: &mut impl NiriRenderer) -> bool { + Shaders::get(renderer) + .program(ProgramType::Resize) + .is_some() } } -- cgit