Skip to content

Commit

Permalink
update wgpu to v0.14
Browse files Browse the repository at this point in the history
  • Loading branch information
teoxoy committed Nov 6, 2022
1 parent 50adb8b commit f2c8f5e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static-rc = { version = "0.5", features = ["alloc"], default-features = false, o
criterion = { version = "0.3", features = ["cargo_bench_support", "html_reports"], default-features = false }
rand = { version = "0.8", features = ["std_rng"], default-features = false }
mimalloc = { version = "0.1", default-features = false }
wgpu = { version = "0.13", default-features = false }
wgpu = { version = "0.14", default-features = false }
futures = { version = "0.3", features = ["executor"], default-features = false }
pprof = { version = "0.8", features = ["criterion", "flamegraph"], default-features = false }
trybuild = { version = "1", default-features = false }
15 changes: 12 additions & 3 deletions tests/wgpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,14 @@ fn in_out<IN: encase::ShaderType, OUT: encase::ShaderType>(
let output_gpu_buffer = device.create_buffer(&wgpu::BufferDescriptor {
label: Some("Output Buffer"),
size: data.len() as _,
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::MAP_READ,
usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_SRC,
mapped_at_creation: false,
});

let mapping_buffer = device.create_buffer(&wgpu::BufferDescriptor {
label: Some("Mapping Buffer"),
size: data.len() as _,
usage: wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::MAP_READ,
mapped_at_creation: false,
});

Expand Down Expand Up @@ -249,14 +256,16 @@ fn in_out<IN: encase::ShaderType, OUT: encase::ShaderType>(
cpass.dispatch_workgroups(1, 1, 1);
}

encoder.copy_buffer_to_buffer(&output_gpu_buffer, 0, &mapping_buffer, 0, data.len() as _);

queue.submit(core::iter::once(encoder.finish()));

let output_slice = output_gpu_buffer.slice(..);
let output_slice = mapping_buffer.slice(..);
output_slice.map_async(wgpu::MapMode::Read, |_| {});

device.poll(wgpu::Maintain::Wait);

let output = output_slice.get_mapped_range().to_vec();
output_gpu_buffer.unmap();
mapping_buffer.unmap();
output
}

0 comments on commit f2c8f5e

Please sign in to comment.