From c90d15397667bab261686cfdaae8c8e085a4574c Mon Sep 17 00:00:00 2001
From: edwloef <edwin.frank.loeffler@gmail.com>
Date: Thu, 19 Dec 2024 15:21:39 +0100
Subject: always increment quad, mesh, text and image layer counts in wgpu
 layer rendering

---
 wgpu/src/lib.rs | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index d79f0dc8..a138ed15 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -268,13 +268,37 @@ impl Renderer {
         let scale = Transformation::scale(scale_factor);
 
         for layer in self.layers.iter() {
-            let Some(physical_bounds) =
-                physical_bounds.intersection(&(layer.bounds * scale))
+            let Some(scissor_rect) = physical_bounds
+                .intersection(&(layer.bounds * scale))
+                .and_then(Rectangle::snap)
             else {
-                continue;
-            };
+                if !layer.quads.is_empty() {
+                    quad_layer += 1;
+                }
+
+                if !layer.triangles.is_empty() {
+                    mesh_layer += layer
+                        .triangles
+                        .iter()
+                        .filter(|item| {
+                            matches!(item, triangle::Item::Group { .. })
+                        })
+                        .count();
+                }
+
+                if !layer.text.is_empty() {
+                    text_layer += layer
+                        .text
+                        .iter()
+                        .filter(|item| matches!(item, text::Item::Group { .. }))
+                        .count();
+                }
+
+                #[cfg(any(feature = "svg", feature = "image"))]
+                if !layer.images.is_empty() {
+                    image_layer += 1;
+                }
 
-            let Some(scissor_rect) = physical_bounds.snap() else {
                 continue;
             };
 
-- 
cgit 


From 2c733d96acd4b5ee5ca2ddeac1646d584f7fe112 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 26 Jan 2025 03:42:26 +0100
Subject: Delegate `layer_count` logic to primitive pipelines

---
 wgpu/src/lib.rs      | 15 +++------------
 wgpu/src/text.rs     |  7 +++++++
 wgpu/src/triangle.rs |  7 +++++++
 3 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index a138ed15..e6e435af 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -277,21 +277,12 @@ impl Renderer {
                 }
 
                 if !layer.triangles.is_empty() {
-                    mesh_layer += layer
-                        .triangles
-                        .iter()
-                        .filter(|item| {
-                            matches!(item, triangle::Item::Group { .. })
-                        })
-                        .count();
+                    mesh_layer +=
+                        triangle::Pipeline::layer_count(&layer.triangles);
                 }
 
                 if !layer.text.is_empty() {
-                    text_layer += layer
-                        .text
-                        .iter()
-                        .filter(|item| matches!(item, text::Item::Group { .. }))
-                        .count();
+                    text_layer += text::Pipeline::layer_count(&layer.text);
                 }
 
                 #[cfg(any(feature = "svg", feature = "image"))]
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 591bc0b7..d7e2e2ae 100644
--- a/wgpu/src/text.rs
+++ b/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,
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index ab88be3b..ac0b2215 100644
--- a/wgpu/src/triangle.rs
+++ b/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,
-- 
cgit