From 68b407883f720ce22386eb68fd5b763ac72e95e5 Mon Sep 17 00:00:00 2001 From: sagudev <16504129+sagudev@users.noreply.github.com> Date: Sat, 29 Aug 2026 08:13:15 +0200 Subject: [PATCH] Generalize `BufferDescriptor` and use `BufferUsagesWebGPU` in remote Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- wgpu-core-remote-types/src/lib.rs | 2 +- wgpu-core-remote/src/global/device.rs | 35 ++++++++++++++++++++++++--- wgpu-types/src/buffer.rs | 4 +-- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/wgpu-core-remote-types/src/lib.rs b/wgpu-core-remote-types/src/lib.rs index 039e53b7a..c7fcdb1c2 100644 --- a/wgpu-core-remote-types/src/lib.rs +++ b/wgpu-core-remote-types/src/lib.rs @@ -50,7 +50,7 @@ assert_ffi_safe!(RequestAdapterOptions); pub type DeviceDescriptor<'a> = wgt::DeviceDescriptor>; pub type QueueDescriptor<'a> = wgt::QueueDescriptor>; -pub type BufferDescriptor<'a> = wgt::BufferDescriptor>; +pub type BufferDescriptor<'a> = wgt::BufferDescriptor, wgt::BufferUsagesWebGPU>; pub type TextureDescriptor<'a> = wgt::TextureDescriptor, Vec>; pub type ExternalTextureDescriptor<'a> = wgt::ExternalTextureDescriptor>; diff --git a/wgpu-core-remote/src/global/device.rs b/wgpu-core-remote/src/global/device.rs index 7c86d2859..0669f85f5 100644 --- a/wgpu-core-remote/src/global/device.rs +++ b/wgpu-core-remote/src/global/device.rs @@ -70,7 +70,17 @@ impl Global { let device = devices.get(device_id); - let buffer = device.create_buffer(desc); + let desc = resource::BufferDescriptor { + label: desc.label.as_ref().map(|s| Cow::Borrowed(s.deref())), + size: desc.size, + usage: wgt::BufferUsages::from_internal_flags( + desc.usage, + wgt::BufferUsagesWGPU::empty(), + ), + mapped_at_creation: desc.mapped_at_creation, + }; + + let buffer = device.create_buffer(&desc); buffers.assign(id_in, buffer); } @@ -114,7 +124,16 @@ impl Global { buffers, devices, .. } = &mut *hub; let device = devices.get(device_id); - buffers.assign(id_in, resource::Buffer::invalid(device, desc)); + let desc = resource::BufferDescriptor { + label: desc.label.as_ref().map(|s| Cow::Borrowed(s.deref())), + size: desc.size, + usage: wgt::BufferUsages::from_internal_flags( + desc.usage, + wgt::BufferUsagesWGPU::empty(), + ), + mapped_at_creation: desc.mapped_at_creation, + }; + buffers.assign(id_in, resource::Buffer::invalid(device, &desc)); } /// Assign `id_in` an error with the given `label`. @@ -295,7 +314,17 @@ impl Global { let device = devices.get(device_id); - let (buffer, err) = unsafe { device.create_buffer_from_hal(Box::new(hal_buffer), desc) }; + let desc = resource::BufferDescriptor { + label: desc.label.as_ref().map(|s| Cow::Borrowed(s.deref())), + size: desc.size, + usage: wgt::BufferUsages::from_internal_flags( + desc.usage, + wgt::BufferUsagesWGPU::empty(), + ), + mapped_at_creation: desc.mapped_at_creation, + }; + + let (buffer, err) = unsafe { device.create_buffer_from_hal(Box::new(hal_buffer), &desc) }; let id = buffers.assign(id_in, buffer); diff --git a/wgpu-types/src/buffer.rs b/wgpu-types/src/buffer.rs index 1469a7ba0..3aede8b27 100644 --- a/wgpu-types/src/buffer.rs +++ b/wgpu-types/src/buffer.rs @@ -11,7 +11,7 @@ use crate::{DownlevelFlags, COPY_BUFFER_ALIGNMENT}; #[repr(C)] #[derive(Clone, Debug, PartialEq, Eq, Hash)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -pub struct BufferDescriptor { +pub struct BufferDescriptor { /// Debug label of a buffer. This will show up in graphics debuggers for easy identification. pub label: L, /// Size of a buffer, in bytes. @@ -22,7 +22,7 @@ pub struct BufferDescriptor { /// Specifying only usages the application will actually perform may increase performance. /// Additionally, on the WebGL backend, there are restrictions on [`BufferUsages::INDEX`]; /// see [`DownlevelFlags::UNRESTRICTED_INDEX_BUFFER`] for more information. - pub usage: BufferUsages, + pub usage: BU, /// Allows a buffer to be mapped immediately after they are made. It does not have to be [`BufferUsages::MAP_READ`] or /// [`BufferUsages::MAP_WRITE`], all buffers are allowed to be mapped at creation. ///