Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move convert_label to Into implementation (#33348)

Browse source 
Signed-off-by: Taym <haddadi.taym@gmail.com>
This commit is contained in:
Taym Haddadi 2024-09-06 23:58:13 +02:00 • committed by GitHub
parent bc04f94a30
commit 152e62022a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/gpubindgroup.rs
View file

@ -17,7 +17,6 @@ use crate::dom::bindings::root::{Dom, DomRoot};
use crate::dom::bindings::str::USVString;
use crate::dom::globalscope::GlobalScope;
use crate::dom::gpubindgrouplayout::GPUBindGroupLayout;
use crate::dom::gpuconvert::convert_label;
use crate::dom::gpudevice::GPUDevice;
#[dom_struct]
@ -86,7 +85,7 @@ impl GPUBindGroup {
.collect::<Vec<_>>();
let desc = BindGroupDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
layout: descriptor.layout.id().0,
entries: Cow::Owned(entries),
};

4
components/script/dom/gpubindgrouplayout.rs
View file

@ -17,7 +17,7 @@ use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::DomRoot;
use crate::dom::bindings::str::USVString;
use crate::dom::globalscope::GlobalScope;
use crate::dom::gpuconvert::{convert_bind_group_layout_entry, convert_label};
use crate::dom::gpuconvert::convert_bind_group_layout_entry;
use crate::dom::gpudevice::GPUDevice;
#[dom_struct]
@ -80,7 +80,7 @@ impl GPUBindGroupLayout {
let desc = match entries {
Ok(entries) => Some(BindGroupLayoutDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
entries: Cow::Owned(entries),
}),
Err(error) => {

3
components/script/dom/gpubuffer.rs
View file

@ -16,7 +16,6 @@ use super::bindings::buffer_source::DataBlock;
use super::bindings::codegen::Bindings::WebGPUBinding::{
GPUBufferDescriptor, GPUBufferMapState, GPUFlagsConstant, GPUMapModeFlags,
};
use super::gpuconvert::convert_label;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{
GPUBufferMethods, GPUMapModeConstants, GPUSize64,
@ -138,7 +137,7 @@ impl GPUBuffer {
descriptor: &GPUBufferDescriptor,
) -> Fallible<DomRoot<GPUBuffer>> {
let desc = wgt::BufferDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
size: descriptor.size as wgt::BufferAddress,
usage: wgt::BufferUsages::from_bits_retain(descriptor.usage),
mapped_at_creation: descriptor.mappedAtCreation,

9
components/script/dom/gpucommandencoder.rs
View file

@ -10,7 +10,6 @@ use webgpu::{
};
use super::bindings::error::Fallible;
use super::gpuconvert::convert_label;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{
GPUCommandBufferDescriptor, GPUCommandEncoderDescriptor, GPUCommandEncoderMethods,
@ -97,7 +96,7 @@ impl GPUCommandEncoder {
device_id: device.id().0,
command_encoder_id,
desc: wgt::CommandEncoderDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
},
})
.expect("Failed to create WebGPU command encoder");
@ -138,7 +137,7 @@ impl GPUCommandEncoderMethods for GPUCommandEncoder {
if let Err(e) = self.channel.0.send(WebGPURequest::BeginComputePass {
command_encoder_id: self.id().0,
compute_pass_id,
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
device_id: self.device.id().0,
}) {
warn!("Failed to send WebGPURequest::BeginComputePass {e:?}");
@ -206,7 +205,7 @@ impl GPUCommandEncoderMethods for GPUCommandEncoder {
if let Err(e) = self.channel.0.send(WebGPURequest::BeginRenderPass {
command_encoder_id: self.id().0,
render_pass_id,
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
depth_stencil_attachment,
color_attachments,
device_id: self.device.id().0,
@ -313,7 +312,7 @@ impl GPUCommandEncoderMethods for GPUCommandEncoder {
command_encoder_id: self.encoder.0,
device_id: self.device.id().0,
desc: wgt::CommandBufferDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
},
})
.expect("Failed to send Finish");

3
components/script/dom/gpucomputepipeline.rs
View file

@ -17,7 +17,6 @@ use crate::dom::bindings::root::{Dom, DomRoot};
use crate::dom::bindings::str::USVString;
use crate::dom::globalscope::GlobalScope;
use crate::dom::gpubindgrouplayout::GPUBindGroupLayout;
use crate::dom::gpuconvert::convert_label;
use crate::dom::gpudevice::GPUDevice;
#[dom_struct]
@ -83,7 +82,7 @@ impl GPUComputePipeline {
let (layout, implicit_ids, _) = device.get_pipeline_layout_data(&descriptor.parent.layout);
let desc = ComputePipelineDescriptor {
label: convert_label(&descriptor.parent.parent),
label: (&descriptor.parent.parent).into(),
layout,
stage: (&descriptor.compute).into(),
cache: None,

13
components/script/dom/gpuconvert.rs
View file

@ -497,14 +497,15 @@ impl TryFrom<&GPUImageCopyTexture> for wgpu_com::ImageCopyTexture {
}
}
pub fn convert_label<'a>(parent: &GPUObjectDescriptorBase) -> Option<Cow<'a, str>> {
if parent.label.is_empty() {
None
} else {
Some(Cow::Owned(parent.label.to_string()))
impl<'a> Into<Option<Cow<'a, str>>> for &GPUObjectDescriptorBase {
fn into(self) -> Option<Cow<'a, str>> {
if self.label.is_empty() {
None
} else {
Some(Cow::Owned(self.label.to_string()))
}
}
}
pub fn convert_bind_group_layout_entry(
bgle: &GPUBindGroupLayoutEntry,
device: &GPUDevice,

3
components/script/dom/gpudevice.rs
View file

@ -52,7 +52,6 @@ use crate::dom::gpubindgrouplayout::GPUBindGroupLayout;
use crate::dom::gpubuffer::GPUBuffer;
use crate::dom::gpucommandencoder::GPUCommandEncoder;
use crate::dom::gpucomputepipeline::GPUComputePipeline;
use crate::dom::gpuconvert::convert_label;
use crate::dom::gpupipelinelayout::GPUPipelineLayout;
use crate::dom::gpuqueue::GPUQueue;
use crate::dom::gpurenderbundleencoder::GPURenderBundleEncoder;
@ -246,7 +245,7 @@ impl GPUDevice {
let (layout, implicit_ids, _) = self.get_pipeline_layout_data(&descriptor.parent.layout);
let desc = wgpu_pipe::RenderPipelineDescriptor {
label: convert_label(&descriptor.parent.parent),
label: (&descriptor.parent.parent).into(),
layout,
cache: None,
vertex: wgpu_pipe::VertexState {

3
components/script/dom/gpupipelinelayout.rs
View file

@ -16,7 +16,6 @@ use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::DomRoot;
use crate::dom::bindings::str::USVString;
use crate::dom::globalscope::GlobalScope;
use crate::dom::gpuconvert::convert_label;
use crate::dom::gpudevice::GPUDevice;
#[dom_struct]
@ -88,7 +87,7 @@ impl GPUPipelineLayout {
.collect::<Vec<_>>();
let desc = PipelineLayoutDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
bind_group_layouts: Cow::Owned(bgls.iter().map(|l| l.0).collect::<Vec<_>>()),
push_constant_ranges: Cow::Owned(vec![]),
};

5
components/script/dom/gpurenderbundleencoder.rs
View file

@ -22,7 +22,6 @@ use crate::dom::bindings::str::USVString;
use crate::dom::globalscope::GlobalScope;
use crate::dom::gpubindgroup::GPUBindGroup;
use crate::dom::gpubuffer::GPUBuffer;
use crate::dom::gpuconvert::convert_label;
use crate::dom::gpudevice::GPUDevice;
use crate::dom::gpurenderbundle::GPURenderBundle;
use crate::dom::gpurenderpipeline::GPURenderPipeline;
@ -82,7 +81,7 @@ impl GPURenderBundleEncoder {
descriptor: &GPURenderBundleEncoderDescriptor,
) -> Fallible<DomRoot<GPURenderBundleEncoder>> {
let desc = RenderBundleEncoderDescriptor {
label: convert_label(&descriptor.parent.parent),
label: (&descriptor.parent.parent).into(),
color_formats: Cow::Owned(
descriptor
.parent
@ -253,7 +252,7 @@ impl GPURenderBundleEncoderMethods for GPURenderBundleEncoder {
/// <https://gpuweb.github.io/gpuweb/#dom-gpurenderbundleencoder-finish>
fn Finish(&self, descriptor: &GPURenderBundleDescriptor) -> DomRoot<GPURenderBundle> {
let desc = wgt::RenderBundleDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
};
let encoder = self.render_bundle_encoder.borrow_mut().take().unwrap();
let render_bundle_id = self

3
components/script/dom/gpusampler.rs
View file

@ -14,7 +14,6 @@ use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::DomRoot;
use crate::dom::bindings::str::USVString;
use crate::dom::globalscope::GlobalScope;
use crate::dom::gpuconvert::convert_label;
use crate::dom::gpudevice::GPUDevice;
#[dom_struct]
@ -83,7 +82,7 @@ impl GPUSampler {
.create_sampler_id(device.id().0.backend());
let compare_enable = descriptor.compare.is_some();
let desc = SamplerDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
address_modes: [
descriptor.addressModeU.into(),
descriptor.addressModeV.into(),

5
components/script/dom/gputexture.rs
View file

@ -19,7 +19,6 @@ use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::{Dom, DomRoot};
use crate::dom::bindings::str::USVString;
use crate::dom::globalscope::GlobalScope;
use crate::dom::gpuconvert::convert_label;
use crate::dom::gpudevice::GPUDevice;
use crate::dom::gputextureview::GPUTextureView;
@ -136,7 +135,7 @@ impl GPUTexture {
) -> Fallible<DomRoot<GPUTexture>> {
let size = (&descriptor.size).try_into()?;
let desc = wgt::TextureDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
size,
mip_level_count: descriptor.mipLevelCount,
sample_count: descriptor.sampleCount,
@ -203,7 +202,7 @@ impl GPUTextureMethods for GPUTexture {
!matches!(descriptor.arrayLayerCount, Some(0))
{
Some(resource::TextureViewDescriptor {
label: convert_label(&descriptor.parent),
label: (&descriptor.parent).into(),
format: descriptor
.format
.map(|f| self.device.validate_texture_format_required_features(&f))