From fee3bf0df4e3099ea74def738be8743b2b72d78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 14 Nov 2023 14:47:29 +0100
Subject: [PATCH] Kill current render pass only when custom pipelines are
 present in layer

---
 wgpu/src/backend.rs | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index f89bcee176..91ae777bc3 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -323,10 +323,9 @@ impl Backend {
                 text_layer += 1;
             }
 
-            // kill render pass to let custom shaders get mut access to encoder
-            let _ = ManuallyDrop::into_inner(render_pass);
-
             if !layer.pipelines.is_empty() {
+                let _ = ManuallyDrop::into_inner(render_pass);
+
                 for pipeline in &layer.pipelines {
                     let bounds = (pipeline.bounds * scale_factor).snap();
 
@@ -342,27 +341,26 @@ impl Backend {
                         encoder,
                     );
                 }
-            }
 
-            // recreate and continue processing layers
-            render_pass = ManuallyDrop::new(encoder.begin_render_pass(
-                &wgpu::RenderPassDescriptor {
-                    label: Some("iced_wgpu::quad render pass"),
-                    color_attachments: &[Some(
-                        wgpu::RenderPassColorAttachment {
-                            view: target,
-                            resolve_target: None,
-                            ops: wgpu::Operations {
-                                load: wgpu::LoadOp::Load,
-                                store: wgpu::StoreOp::Store,
+                render_pass = ManuallyDrop::new(encoder.begin_render_pass(
+                    &wgpu::RenderPassDescriptor {
+                        label: Some("iced_wgpu::quad render pass"),
+                        color_attachments: &[Some(
+                            wgpu::RenderPassColorAttachment {
+                                view: target,
+                                resolve_target: None,
+                                ops: wgpu::Operations {
+                                    load: wgpu::LoadOp::Load,
+                                    store: wgpu::StoreOp::Store,
+                                },
                             },
-                        },
-                    )],
-                    depth_stencil_attachment: None,
-                    timestamp_writes: None,
-                    occlusion_query_set: None,
-                },
-            ));
+                        )],
+                        depth_stencil_attachment: None,
+                        timestamp_writes: None,
+                        occlusion_query_set: None,
+                    },
+                ));
+            }
         }
 
         let _ = ManuallyDrop::into_inner(render_pass);