shader_element: Store program type instead of shader

2 files changed, 28 insertions, 36 deletions

diff --git a/niri-visual-tests/src/cases/gradient_angle.rs b/niri-visual-tests/src/cases/gradient_angle.rs
index 58c09237..66859fc3 100644
--- a/niri-visual-tests/src/cases/gradient_angle.rs
+++ b/niri-visual-tests/src/cases/gradient_angle.rs
@@ -54,30 +54,26 @@ impl TestCase for GradientAngle {
 
     fn render(
         &mut self,
-        renderer: &mut GlesRenderer,
+        _renderer: &mut GlesRenderer,
         size: Size<i32, Physical>,
     ) -> Vec<Box<dyn RenderElement<GlesRenderer>>> {
         let (a, b) = (size.w / 4, size.h / 4);
         let size = (size.w - a * 2, size.h - b * 2);
         let area = Rectangle::from_loc_and_size((a, b), size);
 
-        BorderRenderElement::shader(renderer)
-            .map(|shader| {
-                BorderRenderElement::new(
-                    shader,
-                    Scale::from(1.),
-                    area,
-                    area,
-                    [1., 0., 0., 1.],
-                    [0., 1., 0., 1.],
-                    self.angle - FRAC_PI_2,
-                    area,
-                    0.,
-                    CornerRadius::default(),
-                )
-            })
-            .into_iter()
-            .map(|elem| Box::new(elem) as _)
-            .collect()
+        [BorderRenderElement::new(
+            Scale::from(1.),
+            area,
+            area,
+            [1., 0., 0., 1.],
+            [0., 1., 0., 1.],
+            self.angle - FRAC_PI_2,
+            area,
+            0.,
+            CornerRadius::default(),
+        )]
+        .into_iter()
+        .map(|elem| Box::new(elem) as _)
+        .collect()
     }
 }
diff --git a/niri-visual-tests/src/cases/gradient_area.rs b/niri-visual-tests/src/cases/gradient_area.rs
index c9b09621..c729ea03 100644
--- a/niri-visual-tests/src/cases/gradient_area.rs
+++ b/niri-visual-tests/src/cases/gradient_area.rs
@@ -98,23 +98,19 @@ impl TestCase for GradientArea {
         );
 
         rv.extend(
-            BorderRenderElement::shader(renderer)
-                .map(|shader| {
-                    BorderRenderElement::new(
-                        shader,
-                        Scale::from(1.),
-                        area,
-                        g_area,
-                        [1., 0., 0., 1.],
-                        [0., 1., 0., 1.],
-                        FRAC_PI_4,
-                        area,
-                        0.,
-                        CornerRadius::default(),
-                    )
-                })
-                .into_iter()
-                .map(|elem| Box::new(elem) as _),
+            [BorderRenderElement::new(
+                Scale::from(1.),
+                area,
+                g_area,
+                [1., 0., 0., 1.],
+                [0., 1., 0., 1.],
+                FRAC_PI_4,
+                area,
+                0.,
+                CornerRadius::default(),
+            )]
+            .into_iter()
+            .map(|elem| Box::new(elem) as _),
         );
 
         rv