Small updates

retrofoundry · Jul 10, 2023 · d8fd3d3 · d8fd3d3
1 parent d590cb9
commit d8fd3d3
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 56 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,7 +31,7 @@ env_logger = "0.10.0"
 gilrs = { version = "0.10.2", features = ["serde", "serde-serialize"] }
 glium = { version = "0.32.1", optional = true }
 imgui = { version = "0.11.0", features = ["docking"] }
-imgui-wgpu = { git = "https://github.com/retrofoundry/imgui-wgpu-rs.git", branch = "helix", optional = true }
+imgui-wgpu = { git = "https://github.com/Yatekii/imgui-wgpu-rs.git", optional = true }
 imgui-winit-support = "0.11.0"
 imgui-glium-renderer = { version = "0.11.0", optional = true }
 winit = { version = "0.27.5", features = ["x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"] }

diff --git a/src/gui/glium_renderer.rs b/src/gui/glium_renderer.rs
@@ -122,11 +122,7 @@ impl<'a> Renderer<'a> {
 
     // MARK: - Helpers
 
-    fn render_game(
-        &mut self,
-        frame: &mut Frame,
-        rcp_output: &mut RCPOutput,
-    ) -> anyhow::Result<()> {
+    fn render_game(&mut self, frame: &mut Frame, rcp_output: &mut RCPOutput) -> anyhow::Result<()> {
         // omit the last draw call, because we know we that's an extra from the last flush
         // for draw_call in &self.rcp_output.draw_calls[..self.rcp_output.draw_calls.len() - 1] {
         for draw_call in rcp_output

diff --git a/src/gui/wgpu_renderer.rs b/src/gui/wgpu_renderer.rs
@@ -204,32 +204,6 @@ impl<'a> Renderer<'a> {
             .texture
             .create_view(&wgpu::TextureViewDescriptor::default());
 
-        let mut encoder: wgpu::CommandEncoder =
-            self.device
-                .create_command_encoder(&wgpu::CommandEncoderDescriptor {
-                    label: Some("Game Render Pass Command Encoder"),
-                });
-
-        let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-            label: Some("Game Render Pass"),
-            color_attachments: &[Some(wgpu::RenderPassColorAttachment {
-                view: &frame_texture,
-                resolve_target: None,
-                ops: wgpu::Operations {
-                    load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
-                    store: true,
-                },
-            })],
-            depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment {
-                view: &self.depth_texture,
-                depth_ops: Some(wgpu::Operations {
-                    load: wgpu::LoadOp::Clear(1.0),
-                    store: true,
-                }),
-                stencil_ops: None,
-            }),
-        });
-
         // Prepare the context device
         self.graphics_device.update_frame_count();
 
@@ -241,11 +215,36 @@ impl<'a> Renderer<'a> {
             rcp_output,
         );
 
-        // Draw the RCP output
-        self.graphics_device.draw(&mut rpass);
+        let mut encoder: wgpu::CommandEncoder =
+            self.device
+                .create_command_encoder(&wgpu::CommandEncoderDescriptor {
+                    label: Some("Game Render Pass Command Encoder"),
+                });
+
+        {
+            let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                label: Some("Game Render Pass"),
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                    view: &frame_texture,
+                    resolve_target: None,
+                    ops: wgpu::Operations {
+                        load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
+                        store: true,
+                    },
+                })],
+                depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment {
+                    view: &self.depth_texture,
+                    depth_ops: Some(wgpu::Operations {
+                        load: wgpu::LoadOp::Clear(1.0),
+                        store: true,
+                    }),
+                    stencil_ops: None,
+                }),
+            });
 
-        // Drop the render pass
-        drop(rpass);
+            // Draw the RCP output
+            self.graphics_device.draw(&mut rpass);
+        }
 
         // Finish encoding and submit
         self.queue.submit(Some(encoder.finish()));
@@ -263,25 +262,24 @@ impl<'a> Renderer<'a> {
                     label: Some("ImGui Render Pass Command Encoder"),
                 });
 
-        let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-            label: Some("ImGui Render Pass"),
-            color_attachments: &[Some(wgpu::RenderPassColorAttachment {
-                view: &frame_texture,
-                resolve_target: None,
-                ops: wgpu::Operations {
-                    load: wgpu::LoadOp::Load,
-                    store: true,
-                },
-            })],
-            depth_stencil_attachment: None,
-        });
-
-        // Render the ImGui content
-        self.renderer
-            .render(imgui_draw_data, &self.queue, &self.device, &mut rpass)?;
-
-        // Drop the render pass
-        drop(rpass);
+        {
+            let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                label: Some("ImGui Render Pass"),
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                    view: &frame_texture,
+                    resolve_target: None,
+                    ops: wgpu::Operations {
+                        load: wgpu::LoadOp::Load,
+                        store: true,
+                    },
+                })],
+                depth_stencil_attachment: None,
+            });
+
+            // Render the ImGui content
+            self.renderer
+                .render(imgui_draw_data, &self.queue, &self.device, &mut rpass)?;
+        }
 
         // Finish encoding and submit
         self.queue.submit(Some(encoder.finish()));

diff --git a/src/gui/windows.rs b/src/gui/windows.rs
@@ -122,5 +122,5 @@ pub extern "C" fn GUIShowProfilerWindow(ui: &Ui, gui: Option<&mut Gui>, opened:
         return;
     }
 
-    ui.show_profiler_window(opened as &mut bool, gui);
+    ui.show_profiler_window(opened, gui);
 }