Fix render pass being dropped too late

emilk · Dec 12, 2024 · 40f0999 · 40f0999
1 parent a8e8e93
commit 40f0999
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/crates/eframe/src/web/web_painter_wgpu.rs b/crates/eframe/src/web/web_painter_wgpu.rs
@@ -2,7 +2,7 @@ use std::sync::{mpsc, Arc};
 
 use super::web_painter::WebPainter;
 use crate::epaint::ColorImage;
-use crate::{epaint, WebOptions};
+use crate::WebOptions;
 use egui::{Event, UserData, ViewportId};
 use egui_wgpu::capture::CaptureState;
 use egui_wgpu::{RenderState, SurfaceErrorAction, WgpuSetup};

diff --git a/crates/egui-wgpu/src/capture.rs b/crates/egui-wgpu/src/capture.rs
@@ -178,24 +178,26 @@ impl CaptureState {
             tex_extent,
         );
 
-        let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-            label: Some("blit"),
-            color_attachments: &[Some(wgpu::RenderPassColorAttachment {
-                view: &output_frame.texture.create_view(&Default::default()),
-                resolve_target: None,
-                ops: wgpu::Operations {
-                    load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                    store: StoreOp::Store,
-                },
-            })],
-            depth_stencil_attachment: None,
-            occlusion_query_set: None,
-            timestamp_writes: None,
-        });
+        {
+            let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                label: Some("blit"),
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                    view: &output_frame.texture.create_view(&Default::default()),
+                    resolve_target: None,
+                    ops: wgpu::Operations {
+                        load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
+                        store: StoreOp::Store,
+                    },
+                })],
+                depth_stencil_attachment: None,
+                occlusion_query_set: None,
+                timestamp_writes: None,
+            });
 
-        pass.set_pipeline(&self.pipeline);
-        pass.set_bind_group(0, &self.bind_group, &[]);
-        pass.draw(0..3, 0..1);
+            pass.set_pipeline(&self.pipeline);
+            pass.set_bind_group(0, &self.bind_group, &[]);
+            pass.draw(0..3, 0..1);
+        }
 
         let id = queue.submit(Some(encoder.finish()));
         let buffer_clone = buffer.clone();