mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-22 07:21:04 +01:00
Add Map Alignment type (#1322)
* Add Map Alignment type * Fix clippy warnings * Make buffer_map_async compare range start to MAP_ALIGNMENT
This commit is contained in:
1 parent
27dbf076d5
commit
c820cc8e73
3 files changed
+8
-5
No files matched your search
@@ -27,7 +27,8 @@ use hal::{
|
||||
use parking_lot::{Mutex, MutexGuard};
|
||||
use thiserror::Error;
|
||||
use wgt::{
|
||||
BufferAddress, BufferSize, InputStepMode, TextureDimension, TextureFormat, TextureViewDimension,
|
||||
BufferAddress, BufferSize, InputStepMode, TextureDimension,
|
||||
TextureFormat, TextureViewDimension
|
||||
};
|
||||
|
||||
use std::{
|
||||
@@ -4525,7 +4526,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
HostMap::Write => (wgt::BufferUsage::MAP_WRITE, resource::BufferUse::MAP_WRITE),
|
||||
};
|
||||
|
||||
if range.start % wgt::COPY_BUFFER_ALIGNMENT != 0
|
||||
if range.start % wgt::MAP_ALIGNMENT != 0
|
||||
|| range.end % wgt::COPY_BUFFER_ALIGNMENT != 0
|
||||
{
|
||||
return Err(resource::BufferAccessError::UnalignedRange);
|
||||
@@ -4597,10 +4598,10 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
buffer.size - offset
|
||||
};
|
||||
|
||||
if offset % 8 != 0 {
|
||||
if offset % wgt::MAP_ALIGNMENT != 0 {
|
||||
return Err(resource::BufferAccessError::UnalignedOffset { offset });
|
||||
}
|
||||
if range_size % 4 != 0 {
|
||||
if range_size % wgt::COPY_BUFFER_ALIGNMENT != 0 {
|
||||
return Err(resource::BufferAccessError::UnalignedRangeSize { range_size });
|
||||
}
|
||||
|
||||
|
||||
@@ -142,7 +142,7 @@ pub enum BufferAccessError {
|
||||
MissingBufferUsage(#[from] MissingBufferUsageError),
|
||||
#[error("buffer is not mapped")]
|
||||
NotMapped,
|
||||
#[error("buffer map range does not respect `COPY_BUFFER_ALIGNMENT`")]
|
||||
#[error("buffer map range must start aligned to `MAP_ALIGNMENT` and end to `COPY_BUFFER_ALIGNMENT`")]
|
||||
UnalignedRange,
|
||||
#[error("buffer offset invalid: offset {offset} must be multiple of 8")]
|
||||
UnalignedOffset { offset: wgt::BufferAddress },
|
||||
|
||||
@@ -40,6 +40,8 @@ pub const COPY_BYTES_PER_ROW_ALIGNMENT: u32 = 256;
|
||||
pub const BIND_BUFFER_ALIGNMENT: BufferAddress = 256;
|
||||
/// Buffer to buffer copy offsets and sizes must be aligned to this number.
|
||||
pub const COPY_BUFFER_ALIGNMENT: BufferAddress = 4;
|
||||
/// Size to align mappings.
|
||||
pub const MAP_ALIGNMENT: BufferAddress = 8;
|
||||
/// Vertex buffer strides have to be aligned to this number.
|
||||
pub const VERTEX_STRIDE_ALIGNMENT: BufferAddress = 4;
|
||||
/// Alignment all push constants need
|
||||
|
||||
Reference in new issue
Block a user