me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix batched writes logic in iced_wgpu::buffer

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-03-30 13:50:40 +01:00
parent d11e271d26
commit 35af0aa84f
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

57
wgpu/src/buffer.rs
View file

@ -1,7 +1,12 @@
use std::marker::PhantomData;
use std::num::NonZeroU64;
use std::ops::RangeBounds;
pub const MAX_WRITE_SIZE: usize = 1024 * 100;
pub const MAX_WRITE_SIZE: usize = 100 * 1024;
#[allow(unsafe_code)]
const MAX_WRITE_SIZE_U64: NonZeroU64 =
unsafe { NonZeroU64::new_unchecked(MAX_WRITE_SIZE as u64) };
#[derive(Debug)]
pub struct Buffer<T> {
@ -70,40 +75,40 @@ impl<T: bytemuck::Pod> Buffer<T> {
contents: &[T],
) -> usize {
let bytes: &[u8] = bytemuck::cast_slice(contents);
let mut bytes_written = 0;
if bytes.len() <= MAX_WRITE_SIZE {
// Split write into multiple chunks if necessary
while bytes_written + MAX_WRITE_SIZE < bytes.len() {
belt.write_buffer(
encoder,
&self.raw,
offset as u64,
(bytes.len() as u64).try_into().expect("Non-empty write"),
(offset + bytes_written) as u64,
MAX_WRITE_SIZE_U64,
device,
)
.copy_from_slice(bytes);
} else {
let mut bytes_written = 0;
.copy_from_slice(
&bytes[bytes_written..bytes_written + MAX_WRITE_SIZE],
);
let bytes_per_chunk = (bytes.len().min(MAX_WRITE_SIZE) as u64)
.try_into()
.expect("Non-empty write");
while bytes_written < bytes.len() {
belt.write_buffer(
encoder,
&self.raw,
(offset + bytes_written) as u64,
bytes_per_chunk,
device,
)
.copy_from_slice(
&bytes[bytes_written
..bytes_written + bytes_per_chunk.get() as usize],
);
bytes_written += bytes_per_chunk.get() as usize;
}
bytes_written += MAX_WRITE_SIZE;
}
// There will always be some bytes left, since the previous
// loop guarantees `bytes_written < bytes.len()`
let bytes_left = ((bytes.len() - bytes_written) as u64)
.try_into()
.expect("non-empty write");
// Write them
belt.write_buffer(
encoder,
&self.raw,
(offset + bytes_written) as u64,
bytes_left,
device,
)
.copy_from_slice(&bytes[bytes_written..]);
self.offsets.push(offset as u64);
bytes.len()