WIP: refactor(core): ArcCommand::WriteBuffer: serialize offset and size instead of start..end

Author: ErichDonGubler

player/src/lib.rs

@@ -377,19 +377,19 @@ impl Player {
             Action::WriteBuffer {
                 id,
                 data,
-                range,
+                offset,
+                size,
                 queued,
             } => {
                 let buffer = self.resolve_buffer_id(id);
                 let bin = loader.load(&data);
-                let size = (range.end - range.start) as usize;
                 if queued {
                     queue
-                        .write_buffer(buffer, range.start, &bin)
+                        .write_buffer(buffer, offset, &bin)
                         .expect("Queue::write_buffer error");
                 } else {
                     device
-                        .set_buffer_data(&buffer, range.start, &bin[..size])
+                        .set_buffer_data(&buffer, offset, &bin[..size.try_into().unwrap()])
                         .expect("Device::set_buffer_data error");
                 }
             }

wgpu-core/src/device/queue.rs

@@ -1615,19 +1615,13 @@ impl Global {
         #[cfg(feature = "trace")]
         if let Some(ref mut trace) = *queue.device.trace.lock() {
             use crate::device::trace::DataKind;
-
-            // NOTE: This is technically redundant with the checks that are done later, but that's
-            // how `WriteBuffer` is currently stored, so…
-            let end_offset = buffer_offset
-                .checked_add(data.len() as u64)
-                .ok_or(TransferError::SizeOverflow)?;
-
-            let range = buffer_offset..end_offset;
+            let size = data.len() as u64;
             let data = trace.make_binary(DataKind::Bin, data);
             trace.add(Action::WriteBuffer {
                 id: buffer.to_trace(),
                 data,
-                range,
+                offset: buffer_offset,
+                size,
                 queued: true,
             });
         }

wgpu-core/src/device/trace.rs

@@ -3,7 +3,7 @@ mod record;
 #[cfg(feature = "replay")]
 mod replay;
 
-use core::{convert::Infallible, ops::Range};
+use core::convert::Infallible;
 
 use alloc::{string::String, vec::Vec};
 use macro_rules_attribute::apply;
@@ -221,7 +221,8 @@ pub enum Action<'a, R: ReferenceType> {
     WriteBuffer {
         id: R::Buffer,
         data: Data,
-        range: Range<wgt::BufferAddress>,
+        offset: wgt::BufferAddress,
+        size: wgt::BufferAddress,
         queued: bool,
     },
     WriteTexture {

wgpu-core/src/device/trace/record.rs

@@ -893,12 +893,14 @@ fn action_to_owned(action: Action<'_, PointerReferences>) -> Action<'static, Poi
         A::WriteBuffer {
             id,
             data,
-            range,
+            offset,
+            size,
             queued,
         } => A::WriteBuffer {
             id,
             data,
-            range,
+            offset,
+            size,
             queued,
         },
         A::WriteTexture {

wgpu-core/src/resource.rs

@@ -847,8 +847,9 @@ impl Buffer {
                     trace.add(trace::Action::WriteBuffer {
                         id: self.to_trace(),
                         data,
+                        offset: 0,
                         // NOTE: `self.size` here corresponds to `data`'s actual length.
-                        range: 0..self.size,
+                        size: self.size,
                         queued: true,
                     });
                 }
@@ -914,7 +915,8 @@ impl Buffer {
                         trace.add(trace::Action::WriteBuffer {
                             id: self.to_trace(),
                             data,
-                            range: range.clone(),
+                            offset: range.start,
+                            size,
                             queued: false,
                         });
                     }