669d139c13
Didn't remove WgpuWrapper. Not sure if it's needed or not still. ## Testing - Did you test these changes? If so, how? Example runner - Are there any parts that need more testing? Web (portable atomics thingy?), DXC. ## Migration Guide - Bevy has upgraded to [wgpu v24](https://github.com/gfx-rs/wgpu/blob/trunk/CHANGELOG.md#v2400-2025-01-15). - When using the DirectX 12 rendering backend, the new priority system for choosing a shader compiler is as follows: - If the `WGPU_DX12_COMPILER` environment variable is set at runtime, it is used - Else if the new `statically-linked-dxc` feature is enabled, a custom version of DXC will be statically linked into your app at compile time. - Else Bevy will look in the app's working directory for `dxcompiler.dll` and `dxil.dll` at runtime. - Else if they are missing, Bevy will fall back to FXC (not recommended) --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com> Co-authored-by: IceSentry <c.giguere42@gmail.com> Co-authored-by: François Mockers <francois.mockers@vleue.com>
96 lines
2.1 KiB
Rust
96 lines
2.1 KiB
Rust
use crate::define_atomic_id;
|
|
use crate::renderer::WgpuWrapper;
|
|
use core::ops::{Bound, Deref, RangeBounds};
|
|
|
|
define_atomic_id!(BufferId);
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct Buffer {
|
|
id: BufferId,
|
|
value: WgpuWrapper<wgpu::Buffer>,
|
|
}
|
|
|
|
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.value.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(),
|
|
value: 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
|
|
}
|
|
}
|