Delegate layer_count logic to primitive pipelines

wgpu/src/lib.rs

@@ -277,21 +277,12 @@ impl Renderer {
                 }
 
                 if !layer.triangles.is_empty() {
-                    mesh_layer += layer
+                    mesh_layer +=
-                        .triangles
+                        triangle::Pipeline::layer_count(&layer.triangles);
-                        .iter()
-                        .filter(|item| {
-                            matches!(item, triangle::Item::Group { .. })
-                        })
-                        .count();
                 }
 
                 if !layer.text.is_empty() {
-                    text_layer += layer
+                    text_layer += text::Pipeline::layer_count(&layer.text);
-                        .text
-                        .iter()
-                        .filter(|item| matches!(item, text::Item::Group { .. }))
-                        .count();
                 }
 
                 #[cfg(any(feature = "svg", feature = "image"))]

wgpu/src/text.rs

@@ -302,6 +302,13 @@ impl Pipeline {
         }
     }
 
+    pub fn layer_count(batch: &Batch) -> usize {
+        batch
+            .iter()
+            .filter(|item| matches!(item, Item::Group { .. }))
+            .count()
+    }
+
     pub fn prepare(
         &mut self,
         device: &wgpu::Device,

wgpu/src/triangle.rs

@@ -177,6 +177,13 @@ impl Pipeline {
         }
     }
 
+    pub fn layer_count(items: &[Item]) -> usize {
+        items
+            .iter()
+            .filter(|item| matches!(item, Item::Group { .. }))
+            .count()
+    }
+
     pub fn prepare(
         &mut self,
         device: &wgpu::Device,