From 3e4f439b0bafa13b9924b983daebe323f47c3ba2 Mon Sep 17 00:00:00 2001 From: Erich Gubler Date: Wed, 11 Feb 2026 17:12:15 -0500 Subject: [PATCH] refactor(core)!: `ArcCommand::WriteBuffer`: serialize `offset` and `size` instead of `start..end` --- CHANGELOG.md | 1 + player/src/lib.rs | 8 ++++---- player/tests/player/data/buffer-copy.ron | 6 ++---- player/tests/player/data/clear-buffer-texture.ron | 6 ++---- player/tests/player/data/zero-init-buffer.ron | 6 ++---- wgpu-core/src/device/queue.rs | 5 +++-- wgpu-core/src/device/trace.rs | 5 +++-- wgpu-core/src/device/trace/record.rs | 6 ++++-- wgpu-core/src/resource.rs | 6 ++++-- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06d50fc25..13b3d143d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -112,6 +112,7 @@ By @cwfitzgerald in [#8999](https://github.com/gfx-rs/wgpu/pull/8999). - Allow using a shader that defines I/O for dual-source blending in a pipeline that does not make use of it. By @andyleiserson in [#8856](https://github.com/gfx-rs/wgpu/pull/8856). - Validate `strip_index_format` isn't None and equals index buffer format for indexed drawing with strip topology. By @beicause in [#8850](https://github.com/gfx-rs/wgpu/pull/8850). - Renamed `EXPERIMENTAL_PASSTHROUGH_SHADERS` to `PASSTHROUGH_SHADERS` and made this no longer an experimental feature. by @inner-daemons in [#9054](https://github.com/gfx-rs/wgpu/pull/9054). +- BREAKING: End offsets in trace and `player` commands are now represented using `offset` + `size` instead. By @ErichDonGubler in [9073](https://github.com/gfx-rs/wgpu/pull/9073). #### naga diff --git a/player/src/lib.rs b/player/src/lib.rs index 2092c1756..f055ef355 100644 --- a/player/src/lib.rs +++ b/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"); } } diff --git a/player/tests/player/data/buffer-copy.ron b/player/tests/player/data/buffer-copy.ron index 641e78f1f..8d501a672 100644 --- a/player/tests/player/data/buffer-copy.ron +++ b/player/tests/player/data/buffer-copy.ron @@ -21,10 +21,8 @@ WriteBuffer( id: PointerId(0x10), data: File("data1.bin"), - range: ( - start: 0, - end: 16, - ), + offset: 0, + size: 16, queued: true, ), Submit(1, []), diff --git a/player/tests/player/data/clear-buffer-texture.ron b/player/tests/player/data/clear-buffer-texture.ron index 01922105d..bac41a145 100644 --- a/player/tests/player/data/clear-buffer-texture.ron +++ b/player/tests/player/data/clear-buffer-texture.ron @@ -74,10 +74,8 @@ WriteBuffer( id: PointerId(0x110), data: File("data1.bin"), - range: ( - start: 0, - end: 16, - ), + offset: 0, + size: 16, queued: true, ), Submit(1, [ diff --git a/player/tests/player/data/zero-init-buffer.ron b/player/tests/player/data/zero-init-buffer.ron index b1d079ff8..f5b38db60 100644 --- a/player/tests/player/data/zero-init-buffer.ron +++ b/player/tests/player/data/zero-init-buffer.ron @@ -68,10 +68,8 @@ WriteBuffer( id: PointerId(0x120), data: File("data1.bin"), - range: ( - start: 4, - end: 20, - ), + offset: 4, + size: 16, queued: true, ), CreateShaderModule( diff --git a/wgpu-core/src/device/queue.rs b/wgpu-core/src/device/queue.rs index d0375a559..c2da5bdea 100644 --- a/wgpu-core/src/device/queue.rs +++ b/wgpu-core/src/device/queue.rs @@ -1613,12 +1613,13 @@ impl Global { #[cfg(feature = "trace")] if let Some(ref mut trace) = *queue.device.trace.lock() { use crate::device::trace::DataKind; - let range = buffer_offset..buffer_offset + data.len() as u64; + 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, }); } diff --git a/wgpu-core/src/device/trace.rs b/wgpu-core/src/device/trace.rs index 529cc07bc..2fcc7820b 100644 --- a/wgpu-core/src/device/trace.rs +++ b/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, + offset: wgt::BufferAddress, + size: wgt::BufferAddress, queued: bool, }, WriteTexture { diff --git a/wgpu-core/src/device/trace/record.rs b/wgpu-core/src/device/trace/record.rs index f9c39d2f7..cefb5f0ff 100644 --- a/wgpu-core/src/device/trace/record.rs +++ b/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 { diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs index fc1bcc951..884b8eef2 100644 --- a/wgpu-core/src/resource.rs +++ b/wgpu-core/src/resource.rs @@ -823,7 +823,8 @@ impl Buffer { trace.add(trace::Action::WriteBuffer { id: self.to_trace(), data, - range: 0..self.size, + offset: 0, + size: self.size, queued: true, }); } @@ -889,7 +890,8 @@ impl Buffer { trace.add(trace::Action::WriteBuffer { id: self.to_trace(), data, - range: range.clone(), + offset: range.start, + size, queued: false, }); }