zenithsiz/zsw
1
0
Fork 0
mirror of https://github.com/Zenithsiz/zsw.git synced 2026-02-05 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wgpu::render now doesn't return the surface size.

Browse Source
This commit is contained in:
Filipe Rodrigues 2022-02-16 06:01:16 +00:00
parent fec918c503
commit cd5a479ed5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zsw-renderer/src/lib.rs
View File

@ -192,7 +192,8 @@ impl Renderer {
let mut surface_lock = wgpu.lock_surface().await.allow::<MightBlock>();
// Then render
wgpu.render(&mut surface_lock, |encoder, surface_view, surface_size| {
let surface_size = wgpu.surface_size(&surface_lock);
wgpu.render(&mut surface_lock, |encoder, surface_view| {
// Render the panels
{
// DEADLOCK: Caller ensures we can lock it after the surface

5
zsw-wgpu/src/lib.rs
View File

@ -228,11 +228,10 @@ impl<'window> Wgpu<'window> {
///
/// If any resize is queued, it will be executed *before* the frame starts, so the frame will start
/// with the new size.
// TODO: Remove size from passed parameters
pub fn render(
&self,
surface_lock: &mut SurfaceLock,
f: impl FnOnce(&mut wgpu::CommandEncoder, &wgpu::TextureView, PhysicalSize<u32>) -> Result<(), anyhow::Error>,
f: impl FnOnce(&mut wgpu::CommandEncoder, &wgpu::TextureView) -> Result<(), anyhow::Error>,
) -> Result<(), anyhow::Error> {
let surface = surface_lock.get_mut(&self.lock_source);
@ -265,7 +264,7 @@ impl<'window> Wgpu<'window> {
let mut encoder = self.device.create_command_encoder(&encoder_descriptor);
// And render using `f`
f(&mut encoder, &surface_texture_view, surface.size).context("Unable to render")?;
f(&mut encoder, &surface_texture_view).context("Unable to render")?;
// Finally submit everything to the queue and present the surface's texture
self.queue.submit([encoder.finish()]);