mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-20 22:41:07 +01:00
Generalize BufferDescriptor and use BufferUsagesWebGPU in remote
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
1 parent
a26e342d9b
commit
68b407883f
3 files changed
+35
-6
No files matched your search
@@ -50,7 +50,7 @@ assert_ffi_safe!(RequestAdapterOptions);
|
||||
|
||||
pub type DeviceDescriptor<'a> = wgt::DeviceDescriptor<Label<'a>>;
|
||||
pub type QueueDescriptor<'a> = wgt::QueueDescriptor<Label<'a>>;
|
||||
pub type BufferDescriptor<'a> = wgt::BufferDescriptor<Label<'a>>;
|
||||
pub type BufferDescriptor<'a> = wgt::BufferDescriptor<Label<'a>, wgt::BufferUsagesWebGPU>;
|
||||
pub type TextureDescriptor<'a> = wgt::TextureDescriptor<Label<'a>, Vec<wgt::TextureFormat>>;
|
||||
pub type ExternalTextureDescriptor<'a> = wgt::ExternalTextureDescriptor<Label<'a>>;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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<L> {
|
||||
pub struct BufferDescriptor<L, BU = BufferUsages> {
|
||||
/// 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<L> {
|
||||
/// 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.
|
||||
///
|
||||
|
||||
Reference in new issue
Block a user