WIP: diag(core): unify msgs. b/w buffer overrun error cases

Author: ErichDonGubler

wgpu-core/src/command/transfer.rs

@@ -47,19 +47,20 @@ pub enum TransferError {
     MissingBufferUsage(#[from] MissingBufferUsageError),
     #[error(transparent)]
     MissingTextureUsage(#[from] MissingTextureUsageError),
-    #[error(
-        "Copy at offset {start_offset} bytes would end up overrunning the bounds of the {side:?} buffer of size {buffer_size}"
-    )]
+    #[error("Start offset ({offset}) is out-of-bounds for buffer of size {buffer_size}")]
     BufferStartOffsetOverrun {
-        start_offset: BufferAddress,
+        offset: BufferAddress,
         buffer_size: BufferAddress,
         side: CopySide,
     },
     #[error(
-        "Copy at offset {start_offset} for {size} bytes would end up overrunning the bounds of the {side:?} buffer of size {buffer_size}"
+        "End offset (start at {} + size of {}) is out-of-bounds for buffer of size {}",
+        offset,
+        size,
+        buffer_size
     )]
-    BufferOverrun {
-        start_offset: BufferAddress,
+    BufferEndOffsetOverrun {
+        offset: BufferAddress,
         size: BufferAddress,
         buffer_size: BufferAddress,
         side: CopySide,
@@ -191,7 +192,7 @@ impl WebGpuError for TransferError {
             Self::MissingTextureUsage(e) => e,
             Self::MemoryInitFailure(e) => e,
 
-            Self::BufferOverrun { .. }
+            Self::BufferEndOffsetOverrun { .. }
             | Self::TextureOverrun { .. }
             | Self::BufferStartOffsetOverrun { .. }
             | Self::UnsupportedPartialTransfer { .. }
@@ -353,8 +354,8 @@ pub(crate) fn validate_linear_texture_data(
 
     // Avoid underflow in the subtraction by checking bytes_in_copy against buffer_size first.
     if bytes_in_copy > buffer_size || offset > buffer_size - bytes_in_copy {
-        return Err(TransferError::BufferOverrun {
-            start_offset: offset,
+        return Err(TransferError::BufferEndOffsetOverrun {
+            offset,
             size: bytes_in_copy,
             buffer_size,
             side: buffer_side,
@@ -995,7 +996,7 @@ pub(super) fn copy_buffer_to_buffer(
     // TODO: This check isn't part of the spec., but it looks like it should be.
     if source_offset >= src_buffer.size {
         return Err(TransferError::BufferStartOffsetOverrun {
-            start_offset: destination_offset,
+            offset: destination_offset,
             buffer_size: dst_buffer.size,
             side: CopySide::Destination,
         }
@@ -1038,8 +1039,8 @@ pub(super) fn copy_buffer_to_buffer(
     }
 
     if size > src_buffer.size - source_offset {
-        return Err(TransferError::BufferOverrun {
-            start_offset: source_offset,
+        return Err(TransferError::BufferEndOffsetOverrun {
+            offset: source_offset,
             size,
             buffer_size: src_buffer.size,
             side: CopySide::Source,
@@ -1053,16 +1054,16 @@ pub(super) fn copy_buffer_to_buffer(
     // things in this order.
     if destination_offset >= dst_buffer.size {
         return Err(TransferError::BufferStartOffsetOverrun {
-            start_offset: destination_offset,
+            offset: destination_offset,
             buffer_size: dst_buffer.size,
             side: CopySide::Destination,
         }
         .into());
     }
     // NOTE: Should never underflow because of our earlier check.
     if size > dst_buffer.size - destination_offset {
-        return Err(TransferError::BufferOverrun {
-            start_offset: destination_offset,
+        return Err(TransferError::BufferEndOffsetOverrun {
+            offset: destination_offset,
             size,
             buffer_size: dst_buffer.size,
             side: CopySide::Destination,

wgpu-core/src/device/queue.rs

@@ -663,14 +663,14 @@ impl Queue {
 
         if buffer_offset >= buffer.size {
             return Err(TransferError::BufferStartOffsetOverrun {
-                start_offset: buffer_offset,
+                offset: buffer_offset,
                 buffer_size: buffer_size.get(),
                 side: CopySide::Destination,
             });
         }
         if buffer_size.get() > buffer.size - buffer_offset {
-            return Err(TransferError::BufferOverrun {
-                start_offset: buffer_offset,
+            return Err(TransferError::BufferEndOffsetOverrun {
+                offset: buffer_offset,
                 size: buffer_size.get(),
                 buffer_size: buffer.size,
                 side: CopySide::Destination,