mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-20 06:21:13 +01:00
Experimental ReadBuffer structure
This commit is contained in:
1 parent
f891e86e87
commit
91fca7c5c3
4 files changed
+15
-12
No files matched your search
@@ -1325,7 +1325,6 @@ impl crate::Context for Context {
|
||||
Ok(ptr) => BufferMappedRange {
|
||||
ptr,
|
||||
size: size as usize,
|
||||
phantom: PhantomData,
|
||||
},
|
||||
Err(err) => self.handle_error_fatal(err, "Buffer::get_mapped_range"),
|
||||
}
|
||||
@@ -1897,13 +1896,12 @@ fn default_error_handler(err: crate::Error) {
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct BufferMappedRange<'a> {
|
||||
pub struct BufferMappedRange {
|
||||
ptr: *mut u8,
|
||||
size: usize,
|
||||
phantom: PhantomData<&'a ()>,
|
||||
}
|
||||
|
||||
impl<'a> crate::BufferMappedRangeSlice for BufferMappedRange<'a> {
|
||||
impl crate::BufferMappedRangeSlice for BufferMappedRange {
|
||||
fn slice(&self) -> &[u8] {
|
||||
unsafe { slice::from_raw_parts(self.ptr, self.size) }
|
||||
}
|
||||
@@ -1913,7 +1911,7 @@ impl<'a> crate::BufferMappedRangeSlice for BufferMappedRange<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Drop for BufferMappedRange<'a> {
|
||||
impl Drop for BufferMappedRange {
|
||||
fn drop(&mut self) {
|
||||
// Intentionally left blank so that `BufferMappedRange` still
|
||||
// implements `Drop`, to match the web backend
|
||||
|
||||
+2
-5
@@ -2,7 +2,6 @@ use std::{
|
||||
collections::HashSet,
|
||||
fmt,
|
||||
future::Future,
|
||||
marker::PhantomData,
|
||||
ops::Range,
|
||||
pin::Pin,
|
||||
task::{self, Poll},
|
||||
@@ -1436,7 +1435,6 @@ impl crate::Context for Context {
|
||||
BufferMappedRange {
|
||||
actual_mapping,
|
||||
temporary_mapping,
|
||||
phantom: PhantomData,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1888,13 +1886,12 @@ impl crate::Context for Context {
|
||||
pub(crate) type SwapChainOutputDetail = ();
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct BufferMappedRange<'a> {
|
||||
pub struct BufferMappedRange {
|
||||
actual_mapping: js_sys::Uint8Array,
|
||||
temporary_mapping: Vec<u8>,
|
||||
phantom: PhantomData<&'a ()>,
|
||||
}
|
||||
|
||||
impl<'a> crate::BufferMappedRangeSlice for BufferMappedRange<'a> {
|
||||
impl crate::BufferMappedRangeSlice for BufferMappedRange {
|
||||
fn slice(&self) -> &[u8] {
|
||||
&self.temporary_mapping
|
||||
}
|
||||
|
||||
+2
-2
@@ -1690,14 +1690,14 @@ trait BufferMappedRangeSlice {
|
||||
#[derive(Debug)]
|
||||
pub struct BufferView<'a> {
|
||||
slice: BufferSlice<'a>,
|
||||
data: BufferMappedRange<'a>,
|
||||
data: BufferMappedRange,
|
||||
}
|
||||
|
||||
/// Write only view into mapped buffer.
|
||||
#[derive(Debug)]
|
||||
pub struct BufferViewMut<'a> {
|
||||
slice: BufferSlice<'a>,
|
||||
data: BufferMappedRange<'a>,
|
||||
data: BufferMappedRange,
|
||||
readable: bool,
|
||||
}
|
||||
|
||||
|
||||
@@ -54,3 +54,11 @@ pub fn make_spirv<'a>(data: &'a [u8]) -> super::ShaderSource<'a> {
|
||||
);
|
||||
super::ShaderSource::SpirV(words)
|
||||
}
|
||||
|
||||
struct ReadBuffer(super::BufferMappedRange);
|
||||
impl std::ops::Deref for ReadBuffer{
|
||||
type Target = [u8];
|
||||
fn deref(&self) -> &[u8] {
|
||||
super::BufferMappedRangeSlice::slice(&self.0)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user