nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 14:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rs] Replace Pod using zerocopy crate

Browse Source 
See https://github.com/gfx-rs/wgpu/pull/256#issuecomment-515277497
This commit is contained in:
Paul Kernfeld 2019-07-27 13:33:45 -04:00
parent 8bb84c2769
commit ece89ddb09
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wgpu/Cargo.toml
View File

@ -26,6 +26,7 @@ gl = ["wgn/gfx-backend-gl"]
#TODO: only depend on the published version
wgn = { package = "wgpu-native", version = "0.2.6", features = ["local", "window-winit"], git = "https://github.com/gfx-rs/wgpu", rev = "5224bb812420e420485ee08ad8cb820695a3e6eb" }
arrayvec = "0.4"
zerocopy = "0.2"
[dev-dependencies]
cgmath = "0.17"

43
wgpu/src/lib.rs
View File

@ -1,7 +1,9 @@
//! A cross-platform graphics and compute library based on WebGPU.
use arrayvec::ArrayVec;
use zerocopy::{AsBytes, FromBytes, LayoutVerified};
use std::convert::TryFrom;
use std::ffi::CString;
use std::ops::Range;
use std::ptr;
@ -37,8 +39,8 @@ pub use wgn::{
Limits,
LoadOp,
Origin3d,
Pod,
PowerPreference,
PresentMode,
PrimitiveTopology,
RasterizationStateDescriptor,
RenderPassDepthStencilAttachmentDescriptor,
@ -59,7 +61,6 @@ pub use wgn::{
TextureViewDimension,
VertexAttributeDescriptor,
VertexFormat,
PresentMode,
};
#[cfg(feature = "gl")]
@ -814,7 +815,7 @@ impl<T> Drop for BufferAsyncMapping<T> {
struct BufferMapReadAsyncUserData<T, F>
where
T: Pod,
T: FromBytes,
F: FnOnce(BufferMapAsyncResult<&[T]>),
{
size: BufferAddress,
@ -825,7 +826,7 @@ where
struct BufferMapWriteAsyncUserData<T, F>
where
T: Pod,
T: AsBytes + FromBytes,
F: FnOnce(BufferMapAsyncResult<&mut [T]>),
{
size: BufferAddress,
@ -837,29 +838,25 @@ where
impl Buffer {
pub fn map_read_async<T, F>(&self, start: BufferAddress, size: BufferAddress, callback: F)
where
T: 'static + Pod,
T: 'static + FromBytes,
F: FnOnce(BufferMapAsyncResult<&[T]>) + 'static,
{
let type_size = std::mem::size_of::<T>() as BufferAddress;
assert_ne!(type_size, 0);
assert_eq!(size % type_size, 0);
extern "C" fn buffer_map_read_callback_wrapper<T, F>(
status: wgn::BufferMapAsyncStatus,
data: *const u8,
user_data: *mut u8,
) where
T: Pod,
T: FromBytes,
F: FnOnce(BufferMapAsyncResult<&[T]>),
{
let user_data =
unsafe { Box::from_raw(user_data as *mut BufferMapReadAsyncUserData<T, F>) };
let data = unsafe {
slice::from_raw_parts(
data as *const T,
user_data.size as usize / std::mem::size_of::<T>(),
)
let data: &[u8] = unsafe {
slice::from_raw_parts(data as *const u8, usize::try_from(user_data.size).unwrap())
};
let data = LayoutVerified::new_slice(data)
.expect("could not interpret bytes as &[T]")
.into_slice();
if let wgn::BufferMapAsyncStatus::Success = status {
(user_data.callback)(Ok(BufferAsyncMapping {
data,
@ -887,29 +884,25 @@ impl Buffer {
pub fn map_write_async<T, F>(&self, start: BufferAddress, size: BufferAddress, callback: F)
where
T: 'static + Pod,
T: 'static + AsBytes + FromBytes,
F: FnOnce(BufferMapAsyncResult<&mut [T]>) + 'static,
{
let type_size = std::mem::size_of::<T>() as BufferAddress;
assert_ne!(type_size, 0);
assert_eq!(size % type_size, 0);
extern "C" fn buffer_map_write_callback_wrapper<T, F>(
status: wgn::BufferMapAsyncStatus,
data: *mut u8,
user_data: *mut u8,
) where
T: Pod,
T: AsBytes + FromBytes,
F: FnOnce(BufferMapAsyncResult<&mut [T]>),
{
let user_data =
unsafe { Box::from_raw(user_data as *mut BufferMapWriteAsyncUserData<T, F>) };
let data = unsafe {
slice::from_raw_parts_mut(
data as *mut T,
user_data.size as usize / std::mem::size_of::<T>(),
)
slice::from_raw_parts_mut(data as *mut u8, usize::try_from(user_data.size).unwrap())
};
let data = LayoutVerified::new_slice(data)
.expect("could not interpret bytes as &mut [T]")
.into_mut_slice();
if let wgn::BufferMapAsyncStatus::Success = status {
(user_data.callback)(Ok(BufferAsyncMapping {
data,