72aaa41603
# Objective
* Remove all uses of render_resource_wrapper.
* Make it easier to share a `wgpu::Device` between Bevy and application
code.
## Solution
Removed the `render_resource_wrapper` macro.
To improve the `RenderCreation:: Manual ` API, `ErasedRenderDevice` was
replaced by `Arc`. Unfortunately I had to introduce one more usage of
`WgpuWrapper` which seems like an unwanted constraint on the caller.
## Testing
- Did you test these changes? If so, how?
- Ran `cargo test`.
- Ran a few examples.
- Used `RenderCreation::Manual` in my own project
- Exercised `RenderCreation::Automatic` through examples
- Are there any parts that need more testing?
- No
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
- Run examples
- Use `RenderCreation::Manual` in their own project
99 lines
2.1 KiB
Rust
99 lines
2.1 KiB
Rust
use crate::define_atomic_id;
|
|
use crate::renderer::WgpuWrapper;
|
|
use alloc::sync::Arc;
|
|
use core::ops::{Bound, Deref, RangeBounds};
|
|
|
|
define_atomic_id!(BufferId);
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct Buffer {
|
|
id: BufferId,
|
|
value: Arc<WgpuWrapper<wgpu::Buffer>>,
|
|
size: wgpu::BufferAddress,
|
|
}
|
|
|
|
impl Buffer {
|
|
#[inline]
|
|
pub fn id(&self) -> BufferId {
|
|
self.id
|
|
}
|
|
|
|
pub fn slice(&self, bounds: impl RangeBounds<wgpu::BufferAddress>) -> BufferSlice {
|
|
// need to compute and store this manually because wgpu doesn't export offset and size on wgpu::BufferSlice
|
|
let offset = match bounds.start_bound() {
|
|
Bound::Included(&bound) => bound,
|
|
Bound::Excluded(&bound) => bound + 1,
|
|
Bound::Unbounded => 0,
|
|
};
|
|
let size = match bounds.end_bound() {
|
|
Bound::Included(&bound) => bound + 1,
|
|
Bound::Excluded(&bound) => bound,
|
|
Bound::Unbounded => self.size,
|
|
} - offset;
|
|
BufferSlice {
|
|
id: self.id,
|
|
offset,
|
|
size,
|
|
value: self.value.slice(bounds),
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn unmap(&self) {
|
|
self.value.unmap();
|
|
}
|
|
}
|
|
|
|
impl From<wgpu::Buffer> for Buffer {
|
|
fn from(value: wgpu::Buffer) -> Self {
|
|
Buffer {
|
|
id: BufferId::new(),
|
|
size: value.size(),
|
|
value: Arc::new(WgpuWrapper::new(value)),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Deref for Buffer {
|
|
type Target = wgpu::Buffer;
|
|
|
|
#[inline]
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.value
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct BufferSlice<'a> {
|
|
id: BufferId,
|
|
offset: wgpu::BufferAddress,
|
|
value: wgpu::BufferSlice<'a>,
|
|
size: wgpu::BufferAddress,
|
|
}
|
|
|
|
impl<'a> BufferSlice<'a> {
|
|
#[inline]
|
|
pub fn id(&self) -> BufferId {
|
|
self.id
|
|
}
|
|
|
|
#[inline]
|
|
pub fn offset(&self) -> wgpu::BufferAddress {
|
|
self.offset
|
|
}
|
|
|
|
#[inline]
|
|
pub fn size(&self) -> wgpu::BufferAddress {
|
|
self.size
|
|
}
|
|
}
|
|
|
|
impl<'a> Deref for BufferSlice<'a> {
|
|
type Target = wgpu::BufferSlice<'a>;
|
|
|
|
#[inline]
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.value
|
|
}
|
|
}
|