1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
//! GPU buffer management for staging and device memory
use crate::{GpuDevice, GpuError, Result};
use std::sync::Arc;
use wgpu::{Buffer, BufferUsages};
/// Type of GPU buffer
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum BufferType {
/// Staging buffer for CPU to GPU transfer
Staging,
/// Storage buffer for compute operations
Storage,
/// Uniform buffer for shader parameters
Uniform,
/// Read-back buffer for GPU to CPU transfer
ReadBack,
}
/// GPU buffer wrapper with automatic memory management
pub struct GpuBuffer {
buffer: Buffer,
size: u64,
buffer_type: BufferType,
device: Arc<wgpu::Device>,
}
impl GpuBuffer {
/// Create a new GPU buffer
///
/// # Arguments
///
/// * `device` - GPU device
/// * `size` - Buffer size in bytes
/// * `buffer_type` - Type of buffer to create
///
/// # Errors
///
/// Returns an error if buffer creation fails.
pub fn new(device: &GpuDevice, size: u64, buffer_type: BufferType) -> Result<Self> {
let usage = Self::buffer_usage(buffer_type);
let buffer = device.device().create_buffer(&wgpu::BufferDescriptor {
label: Some(&format!("OxiMedia {buffer_type:?} Buffer")),
size,
usage,
mapped_at_creation: false,
});
Ok(Self {
buffer,
size,
buffer_type,
device: Arc::clone(device.device()),
})
}
/// Create a buffer initialized with data
///
/// # Arguments
///
/// * `device` - GPU device
/// * `data` - Initial data
/// * `buffer_type` - Type of buffer to create
///
/// # Errors
///
/// Returns an error if buffer creation fails.
pub fn with_data(device: &GpuDevice, data: &[u8], buffer_type: BufferType) -> Result<Self> {
let size = data.len() as u64;
let usage = Self::buffer_usage(buffer_type);
let buffer = device
.device()
.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some(&format!("OxiMedia {buffer_type:?} Buffer")),
contents: data,
usage,
});
Ok(Self {
buffer,
size,
buffer_type,
device: Arc::clone(device.device()),
})
}
/// Write data to the buffer
///
/// # Arguments
///
/// * `queue` - GPU queue for data transfer
/// * `offset` - Offset in bytes
/// * `data` - Data to write
///
/// # Errors
///
/// Returns an error if the write operation fails or if offset + data size
/// exceeds buffer size.
pub fn write(&self, queue: &wgpu::Queue, offset: u64, data: &[u8]) -> Result<()> {
if offset + data.len() as u64 > self.size {
return Err(GpuError::InvalidBufferSize {
expected: self.size as usize,
actual: (offset + data.len() as u64) as usize,
});
}
queue.write_buffer(&self.buffer, offset, data);
Ok(())
}
/// Read data from the buffer (asynchronously)
///
/// # Arguments
///
/// * `device` - GPU device
/// * `offset` - Offset in bytes
/// * `size` - Number of bytes to read
///
/// # Errors
///
/// Returns an error if the buffer type doesn't support reading or if
/// the read operation fails.
pub async fn read_async(&self, _device: &GpuDevice, offset: u64, size: u64) -> Result<Vec<u8>> {
if self.buffer_type != BufferType::ReadBack {
return Err(GpuError::NotSupported(
"Can only read from ReadBack buffers".to_string(),
));
}
if offset + size > self.size {
return Err(GpuError::InvalidBufferSize {
expected: self.size as usize,
actual: (offset + size) as usize,
});
}
let slice = self.buffer.slice(offset..offset + size);
let (sender, receiver) = futures_channel::oneshot::channel();
slice.map_async(wgpu::MapMode::Read, move |result| {
let _ = sender.send(result);
});
let _ = self.device.poll(wgpu::PollType::wait_indefinitely());
receiver
.await
.map_err(|e| GpuError::BufferMapping(e.to_string()))?
.map_err(|e| GpuError::BufferMapping(e.to_string()))?;
let data = slice.get_mapped_range();
let result = data.to_vec();
drop(data);
self.buffer.unmap();
Ok(result)
}
/// Read data from the buffer (blocking)
///
/// # Arguments
///
/// * `device` - GPU device
/// * `offset` - Offset in bytes
/// * `size` - Number of bytes to read
///
/// # Errors
///
/// Returns an error if the buffer type doesn't support reading or if
/// the read operation fails.
pub fn read(&self, device: &GpuDevice, offset: u64, size: u64) -> Result<Vec<u8>> {
pollster::block_on(self.read_async(device, offset, size))
}
/// Get the underlying WGPU buffer
#[must_use]
pub fn buffer(&self) -> &Buffer {
&self.buffer
}
/// Get buffer size in bytes
#[must_use]
pub fn size(&self) -> u64 {
self.size
}
/// Get buffer type
#[must_use]
pub fn buffer_type(&self) -> BufferType {
self.buffer_type
}
/// Copy data from this buffer to another buffer
///
/// # Arguments
///
/// * `encoder` - Command encoder for recording the copy operation
/// * `dst` - Destination buffer
/// * `src_offset` - Source offset in bytes
/// * `dst_offset` - Destination offset in bytes
/// * `size` - Number of bytes to copy
///
/// # Errors
///
/// Returns an error if offsets or size are invalid.
#[allow(clippy::too_many_arguments)]
pub fn copy_to(
&self,
encoder: &mut wgpu::CommandEncoder,
dst: &Self,
src_offset: u64,
dst_offset: u64,
size: u64,
) -> Result<()> {
if src_offset + size > self.size {
return Err(GpuError::InvalidBufferSize {
expected: self.size as usize,
actual: (src_offset + size) as usize,
});
}
if dst_offset + size > dst.size {
return Err(GpuError::InvalidBufferSize {
expected: dst.size as usize,
actual: (dst_offset + size) as usize,
});
}
encoder.copy_buffer_to_buffer(&self.buffer, src_offset, &dst.buffer, dst_offset, size);
Ok(())
}
fn buffer_usage(buffer_type: BufferType) -> BufferUsages {
match buffer_type {
BufferType::Staging => BufferUsages::MAP_WRITE | BufferUsages::COPY_SRC,
BufferType::Storage => {
BufferUsages::STORAGE | BufferUsages::COPY_DST | BufferUsages::COPY_SRC
}
BufferType::Uniform => BufferUsages::UNIFORM | BufferUsages::COPY_DST,
BufferType::ReadBack => BufferUsages::MAP_READ | BufferUsages::COPY_DST,
}
}
}
impl std::fmt::Debug for GpuBuffer {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("GpuBuffer")
.field("size", &self.size)
.field("buffer_type", &self.buffer_type)
.finish()
}
}
// Add the missing dependency
use wgpu::util::DeviceExt;