A GameCube/Wii emulator and debugger written in Rust.
screenshotter inline sink
Layle6a02a68a86d8
diff --git a/crates/backend-wgpu/src/sink.rs b/crates/backend-wgpu/src/sink.rsindex 893861b..a1bc40d 100644--- a/crates/backend-wgpu/src/sink.rs+++ b/crates/backend-wgpu/src/sink.rs@@ -218,6 +218,65 @@ impl Drop for ThreadedSink {}}+#[cfg(not(target_arch = "wasm32"))]+pub struct InlineSink {+ gx: Arc<Mutex<GxRenderer>>,+ device: wgpu::Device,+ queue: wgpu::Queue,+ scratch: Vec<DrawVertex>,+ recycled_draw_data: Vec<Box<DrawData>>,+}++#[cfg(not(target_arch = "wasm32"))]+impl InlineSink {+ pub fn new(+ device: wgpu::Device,+ queue: wgpu::Queue,+ surface_format: wgpu::TextureFormat,+ ) -> (Arc<Mutex<GxRenderer>>, Self) {+ let gx = Arc::new(Mutex::new(GxRenderer::new(&device, &queue, surface_format)));+ let sink = InlineSink {+ gx: gx.clone(),+ device,+ queue,+ scratch: Vec::new(),+ recycled_draw_data: Vec::new(),+ };+ (gx, sink)+ }+}++#[cfg(not(target_arch = "wasm32"))]+impl RenderSink for InlineSink {+ fn exec(&mut self, action: GxAction) {+ self.gx.lock().unwrap().process_action_with_external_scratch(+ &self.device,+ &self.queue,+ &action,+ &mut self.scratch,+ );++ if let GxAction::Draw(boxed) = action {+ self.recycled_draw_data.push(boxed);+ }+ }++ fn vertex_scratch(&mut self) -> &mut Vec<DrawVertex> {+ &mut self.scratch+ }++ fn flush_efb_copies(&mut self, ram: &mut gecko::mmio::RamViewMut<'_>) {+ self.gx+ .lock()+ .unwrap()+ .drain_pending_writebacks(&self.device, &self.queue, ram);+ }++ fn take_draw_data(&mut self) -> Box<DrawData> {+ self.recycled_draw_data.pop().unwrap_or_default()+ }+}+pub fn action_resets_vertex_scratch(action: &GxAction) -> bool {match action {GxAction::InvalidateCachesdiff --git a/crates/screenshotter/src/bin/screenshotter-worker.rs b/crates/screenshotter/src/bin/screenshotter-worker.rsindex 213dcfe..297b290 100644--- a/crates/screenshotter/src/bin/screenshotter-worker.rs+++ b/crates/screenshotter/src/bin/screenshotter-worker.rs@@ -1,10 +1,10 @@+use backend_wgpu::sink::InlineSink;use backend_wgpu::{GxRenderer, capture};use gecko::HostInput;use gecko::flipper::si::pad;use gecko::flipper::vi::regs::RefreshRate;use gecko::gamecube::GameCube;use gecko::hollywood::ipc::usb as wiimote;-use gecko::host::{GxAction, RenderSink};use gecko::system::{System, SystemId};use gecko::wii::Wii;use std::path::PathBuf;@@ -14,28 +14,6 @@ const IPL: &[u8] = include_bytes!("../../../../private/IPL.decoded.bin");const DSP: &[u8] = include_bytes!("../../../../private/dsp_rom.bin");const COEF: &[u8] = include_bytes!("../../../../private/dsp_coef.bin");-struct SyncSink {- gx: Arc<Mutex<GxRenderer>>,- device: wgpu::Device,- queue: wgpu::Queue,- scratch: Vec<gecko::host::DrawVertex>,-}--impl RenderSink for SyncSink {- fn exec(&mut self, action: GxAction) {- self.gx.lock().unwrap().process_action_with_external_scratch(- &self.device,- &self.queue,- &action,- &mut self.scratch,- );- }-- fn vertex_scratch(&mut self) -> &mut Vec<gecko::host::DrawVertex> {- &mut self.scratch- }-}-fn take_screenshot(device: &wgpu::Device, queue: &wgpu::Queue, gx: &GxRenderer, code: &str, frame: u32) {let _ = device.poll(wgpu::PollType::Wait {submission_index: None,@@ -100,13 +78,7 @@ fn run_one(device: &wgpu::Device, queue: &wgpu::Queue, surface_format: wgpu::Texlet out_dir = format!("screenshotdb/{}", code);std::fs::create_dir_all(&out_dir).expect("Failed to create screenshotdb directory");- let gx = Arc::new(Mutex::new(GxRenderer::new(device, queue, surface_format)));- let sink = SyncSink {- gx: gx.clone(),- device: device.clone(),- queue: queue.clone(),- scratch: Vec::new(),- };+ let (gx, sink) = InlineSink::new(device.clone(), queue.clone(), surface_format);if is_wii {let mut wii = Wii::apploader_hle(image).build();diff --git a/crates/screenshotter/src/main.rs b/crates/screenshotter/src/main.rsindex 5105949..15da2c9 100644--- a/crates/screenshotter/src/main.rs+++ b/crates/screenshotter/src/main.rs@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};use std::process::Command;use std::sync::{Arc, Mutex};-const WORKER_COUNT: usize = 4;+const WORKER_COUNT: usize = 2;const WORKER_BIN: &str = "screenshotter-worker";const WORKER_MEM_MAX_DEFAULT: &str = "8G";