From 5f1eb43161d70b4ef157aae1ebc2b5fb25eb5b27 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 29 Mar 2024 14:29:31 +0100
Subject: Split big `Buffer` writes into multiple chunks
---
wgpu/src/backend.rs | 5 ++++-
wgpu/src/buffer.rs | 42 ++++++++++++++++++++++++++++++++++--------
2 files changed, 38 insertions(+), 9 deletions(-)
(limited to 'wgpu/src')
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 20809373..6ccf4111 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -1,3 +1,4 @@
+use crate::buffer;
use crate::core::{Color, Size, Transformation};
use crate::graphics::backend;
use crate::graphics::color;
@@ -66,7 +67,9 @@ impl Backend {
// TODO: Resize belt smartly (?)
// It would be great if the `StagingBelt` API exposed methods
// for introspection to detect when a resize may be worth it.
- staging_belt: wgpu::util::StagingBelt::new(1024 * 100),
+ staging_belt: wgpu::util::StagingBelt::new(
+ buffer::MAX_WRITE_SIZE as u64,
+ ),
}
}
diff --git a/wgpu/src/buffer.rs b/wgpu/src/buffer.rs
index f8828d46..c9d6b828 100644
--- a/wgpu/src/buffer.rs
+++ b/wgpu/src/buffer.rs
@@ -1,6 +1,8 @@
use std::marker::PhantomData;
use std::ops::RangeBounds;
+pub const MAX_WRITE_SIZE: usize = 1024 * 100;
+
#[derive(Debug)]
pub struct Buffer<T> {
label: &'static str,
@@ -69,14 +71,38 @@ impl<T: bytemuck::Pod> Buffer<T> {
) -> usize {
let bytes: &[u8] = bytemuck::cast_slice(contents);
- belt.write_buffer(
- encoder,
- &self.raw,
- offset as u64,
- (bytes.len() as u64).try_into().expect("Non-empty write"),
- device,
- )
- .copy_from_slice(bytes);
+ if bytes.len() <= MAX_WRITE_SIZE {
+ belt.write_buffer(
+ encoder,
+ &self.raw,
+ offset as u64,
+ (bytes.len() as u64).try_into().expect("Non-empty write"),
+ device,
+ )
+ .copy_from_slice(bytes);
+ } else {
+ let mut bytes_written = 0;
+
+ 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;
+ }
+ }
self.offsets.push(offset as u64);
--
cgit