d70595b667
# Objective - Fixes #6370 - Closes #6581 ## Solution - Added the following lints to the workspace: - `std_instead_of_core` - `std_instead_of_alloc` - `alloc_instead_of_core` - Used `cargo +nightly fmt` with [item level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Item%5C%3A) to split all `use` statements into single items. - Used `cargo clippy --workspace --all-targets --all-features --fix --allow-dirty` to _attempt_ to resolve the new linting issues, and intervened where the lint was unable to resolve the issue automatically (usually due to needing an `extern crate alloc;` statement in a crate root). - Manually removed certain uses of `std` where negative feature gating prevented `--all-features` from finding the offending uses. - Used `cargo +nightly fmt` with [crate level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Crate%5C%3A) to re-merge all `use` statements matching Bevy's previous styling. - Manually fixed cases where the `fmt` tool could not re-merge `use` statements due to conditional compilation attributes. ## Testing - Ran CI locally ## Migration Guide The MSRV is now 1.81. Please update to this version or higher. ## Notes - This is a _massive_ change to try and push through, which is why I've outlined the semi-automatic steps I used to create this PR, in case this fails and someone else tries again in the future. - Making this change has no impact on user code, but does mean Bevy contributors will be warned to use `core` and `alloc` instead of `std` where possible. - This lint is a critical first step towards investigating `no_std` options for Bevy. --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
98 lines
2.2 KiB
Rust
98 lines
2.2 KiB
Rust
use crate::{define_atomic_id, render_resource::resource_macros::render_resource_wrapper};
|
|
use core::ops::{Bound, Deref, RangeBounds};
|
|
|
|
define_atomic_id!(BufferId);
|
|
render_resource_wrapper!(ErasedBuffer, wgpu::Buffer);
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct Buffer {
|
|
id: BufferId,
|
|
value: ErasedBuffer,
|
|
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: ErasedBuffer::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
|
|
}
|
|
}
|