Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

expose render_to #7

Merged
merged 1 commit into from
Sep 17, 2023
Merged

expose render_to #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use context::WgpuContext;
use lazy_regex::regex;
use num::Integer;
use pp::{SourceMap, WGSLError};
use wgpu::{Maintain, SubmissionIndex};
use std::collections::HashMap;
use std::mem::{size_of, take};
use std::sync::atomic::{AtomicBool, Ordering};
Expand Down Expand Up @@ -156,7 +157,8 @@ impl WgpuToyRenderer {
SurfaceError::Timeout => log::warn!("Surface Timeout"),
},
Ok(f) => {
let staging_buffer = self.render_to(f);
let (staging_buffer, _) = self.render_to(&f);
f.present();
wasm_bindgen_futures::spawn_local(Self::postrender(
staging_buffer,
self.screen_width * self.screen_height,
Expand Down Expand Up @@ -184,7 +186,8 @@ impl WgpuToyRenderer {
SurfaceError::Timeout => log::warn!("Surface Timeout"),
},
Ok(f) => {
let staging_buffer = self.render_to(f);
let (staging_buffer, _) = self.render_to(&f);
f.present();
Self::postrender(
staging_buffer,
self.screen_width * self.screen_height,
Expand All @@ -195,7 +198,7 @@ impl WgpuToyRenderer {
}
}

fn render_to(&mut self, frame: wgpu::SurfaceTexture) -> Option<wgpu::Buffer> {
pub fn render_to(&mut self, frame: &wgpu::SurfaceTexture) -> (Option<wgpu::Buffer>, SubmissionIndex) {
let mut encoder = self.wgpu.device.create_command_encoder(&Default::default());
self.bindings.stage(&self.wgpu.queue);
if self.bindings.time.host.frame % STATS_PERIOD == 0 {
Expand Down Expand Up @@ -305,9 +308,9 @@ impl WgpuToyRenderer {
&mut encoder,
&frame.texture.create_view(&Default::default()),
);
self.wgpu.queue.submit(Some(encoder.finish()));
frame.present();
staging_buffer

let i = self.wgpu.queue.submit(Some(encoder.finish()));
(staging_buffer, i)
}

async fn postrender(
Expand Down
Loading