Merge pull request #2701 from edwloef/2700-fix

always increment quad, mesh, text and image layer counts in wgpu layer rendering

3 files changed, 34 insertions, 5 deletions

diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index d79f0dc8..e6e435af 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -268,13 +268,28 @@ 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 +=
+                        triangle::Pipeline::layer_count(&layer.triangles);
+                }
+
+                if !layer.text.is_empty() {
+                    text_layer += text::Pipeline::layer_count(&layer.text);
+                }
+
+                #[cfg(any(feature = "svg", feature = "image"))]
+                if !layer.images.is_empty() {
+                    image_layer += 1;
+                }
 
-            let Some(scissor_rect) = physical_bounds.snap() else {
                 continue;
             };
 
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,