alex/vello
1
0
Fork 0
mirror of https://github.com/italicsjenga/vello.git synced 2025-01-10 12:41:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Rustfmt

Browse source
This commit is contained in:
Raph Levien 2023-01-12 21:11:54 -08:00
parent 4907186de4
commit ed437f7ffc
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/engine.rs
View file

@ -24,9 +24,9 @@ use std::{
use futures_intrusive::channel::shared::GenericOneshotReceiver; use futures_intrusive::channel::shared::GenericOneshotReceiver;
use parking_lot::RawMutex; use parking_lot::RawMutex;
use wgpu::{ use wgpu::{
util::DeviceExt, BindGroup, BindGroupLayout, Buffer, BufferAsyncError, BufferSlice, BufferView, util::DeviceExt, BindGroup, BindGroupLayout, Buffer, BufferAsyncError, BufferSlice,
ComputePipeline, Device, Queue, Texture, TextureAspect, TextureFormat, TextureUsages, BufferUsages, BufferView, ComputePipeline, Device, Queue, Texture, TextureAspect,
TextureView, TextureViewDimension, BufferUsages, TextureFormat, TextureUsages, TextureView, TextureViewDimension,
}; };
pub type Error = Box<dyn std::error::Error>; pub type Error = Box<dyn std::error::Error>;
@ -242,7 +242,8 @@ impl Engine {
for command in &recording.commands { for command in &recording.commands {
match command { match command {
Command::Upload(buf_proxy, bytes) => { Command::Upload(buf_proxy, bytes) => {
let usage = BufferUsages::COPY_SRC | BufferUsages::COPY_DST | BufferUsages::STORAGE; let usage =
BufferUsages::COPY_SRC | BufferUsages::COPY_DST | BufferUsages::STORAGE;
let buf = self.pool.get_buf(bytes.len() as u64, usage, device); let buf = self.pool.get_buf(bytes.len() as u64, usage, device);
// TODO: if buffer is newly created, might be better to make it mapped at creation // TODO: if buffer is newly created, might be better to make it mapped at creation
// and copy. However, we expect reuse will be most common. // and copy. However, we expect reuse will be most common.
@ -528,7 +529,8 @@ impl BindMap {
continue; continue;
} }
if let Entry::Vacant(v) = self.buf_map.entry(proxy.id) { if let Entry::Vacant(v) = self.buf_map.entry(proxy.id) {
let usage = BufferUsages::COPY_SRC | BufferUsages::COPY_DST | BufferUsages::STORAGE; let usage =
BufferUsages::COPY_SRC | BufferUsages::COPY_DST | BufferUsages::STORAGE;
let buf = pool.get_buf(proxy.size, usage, device); let buf = pool.get_buf(proxy.size, usage, device);
v.insert(buf); v.insert(buf);
} }
@ -598,7 +600,12 @@ impl BindMap {
Ok(bind_group) Ok(bind_group)
} }
fn get_or_create(&mut self, proxy: BufProxy, device: &Device, pool: &mut ResourcePool) -> Result<&Buffer, Error> { fn get_or_create(
&mut self,
proxy: BufProxy,
device: &Device,
pool: &mut ResourcePool,
) -> Result<&Buffer, Error> {
match self.buf_map.entry(proxy.id) { match self.buf_map.entry(proxy.id) {
Entry::Occupied(occupied) => Ok(occupied.into_mut()), Entry::Occupied(occupied) => Ok(occupied.into_mut()),
Entry::Vacant(vacant) => { Entry::Vacant(vacant) => {