nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-02-12 06:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require mapped buffers to be aligned

Browse Source
This commit is contained in:
Dzmitry Malyshau 2020-07-01 10:42:34 -04:00
parent d90beda4e7
commit 0929425477
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wgpu-core/src/device/mod.rs
View File

@ -22,10 +22,7 @@ use hal::{
window::{PresentationSurface as _, Surface as _},
};
use parking_lot::{Mutex, MutexGuard};
use wgt::{
BufferAddress, BufferSize, InputStepMode, TextureDimension, TextureFormat,
BIND_BUFFER_ALIGNMENT,
};
use wgt::{BufferAddress, BufferSize, InputStepMode, TextureDimension, TextureFormat};
use std::{
collections::hash_map::Entry, ffi, iter, marker::PhantomData, mem, ops::Range, ptr, slice,
@ -670,6 +667,14 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
log::info!("Create buffer {:?} with ID {:?}", desc, id_in);
if desc.mapped_at_creation {
assert_eq!(
desc.size % wgt::COPY_BUFFER_ALIGNMENT,
0,
"Buffers that are mapped at creation have to be aligned to COPY_BUFFER_ALIGNMENT"
);
}
let (device_guard, mut token) = hub.devices.read(&mut token);
let device = &device_guard[device_id];
let mut buffer = device.create_buffer(device_id, desc, gfx_memory::Kind::General);
@ -1535,7 +1540,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
};
assert_eq!(
bb.offset % BIND_BUFFER_ALIGNMENT,
bb.offset % wgt::BIND_BUFFER_ALIGNMENT,
0,
"Buffer offset {} must be a multiple of BIND_BUFFER_ALIGNMENT",
bb.offset
@ -2792,6 +2797,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
HostMap::Write => (wgt::BufferUsage::MAP_WRITE, resource::BufferUse::MAP_WRITE),
};
assert_eq!(range.start % wgt::COPY_BUFFER_ALIGNMENT, 0);
assert_eq!(range.end % wgt::COPY_BUFFER_ALIGNMENT, 0);
let (device_id, ref_count) = {
let (mut buffer_guard, _) = hub.buffers.write(&mut token);
let buffer = &mut buffer_guard[buffer_id];

2
wgpu-core/src/device/queue.rs
View File

@ -188,7 +188,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
data_size % wgt::COPY_BUFFER_ALIGNMENT,
0,
"Buffer write size {} must be a multiple of {}",
buffer_offset,
data_size,
wgt::COPY_BUFFER_ALIGNMENT,
);
assert_eq!(