mirror of
https://github.com/gfx-rs/wgpu.git
synced 2024-11-22 14:55:05 +00:00
remove duplicate label fields
This commit is contained in:
parent
bbf824767d
commit
beaa6e95e4
@ -475,7 +475,6 @@ pub struct BindGroupLayout<A: HalApi> {
|
|||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
pub(crate) binding_count_validator: BindingTypeMaxCountValidator,
|
pub(crate) binding_count_validator: BindingTypeMaxCountValidator,
|
||||||
pub(crate) info: ResourceInfo<BindGroupLayout<A>>,
|
pub(crate) info: ResourceInfo<BindGroupLayout<A>>,
|
||||||
pub(crate) label: String,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<A: HalApi> Drop for BindGroupLayout<A> {
|
impl<A: HalApi> Drop for BindGroupLayout<A> {
|
||||||
@ -505,10 +504,6 @@ impl<A: HalApi> Resource for BindGroupLayout<A> {
|
|||||||
fn as_info_mut(&mut self) -> &mut ResourceInfo<Self> {
|
fn as_info_mut(&mut self) -> &mut ResourceInfo<Self> {
|
||||||
&mut self.info
|
&mut self.info
|
||||||
}
|
}
|
||||||
|
|
||||||
fn label(&self) -> &str {
|
|
||||||
&self.label
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<A: HalApi> ParentDevice<A> for BindGroupLayout<A> {
|
impl<A: HalApi> ParentDevice<A> for BindGroupLayout<A> {
|
||||||
|
@ -1537,7 +1537,6 @@ impl<A: HalApi> Device<A> {
|
|||||||
device: self.clone(),
|
device: self.clone(),
|
||||||
interface: Some(interface),
|
interface: Some(interface),
|
||||||
info: ResourceInfo::new(desc.label.borrow_or_default(), None),
|
info: ResourceInfo::new(desc.label.borrow_or_default(), None),
|
||||||
label: desc.label.borrow_or_default().to_string(),
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1580,7 +1579,6 @@ impl<A: HalApi> Device<A> {
|
|||||||
device: self.clone(),
|
device: self.clone(),
|
||||||
interface: None,
|
interface: None,
|
||||||
info: ResourceInfo::new(desc.label.borrow_or_default(), None),
|
info: ResourceInfo::new(desc.label.borrow_or_default(), None),
|
||||||
label: desc.label.borrow_or_default().to_string(),
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1857,7 +1855,6 @@ impl<A: HalApi> Device<A> {
|
|||||||
label.unwrap_or("<BindGroupLayout>"),
|
label.unwrap_or("<BindGroupLayout>"),
|
||||||
Some(self.tracker_indices.bind_group_layouts.clone()),
|
Some(self.tracker_indices.bind_group_layouts.clone()),
|
||||||
),
|
),
|
||||||
label: label.unwrap_or_default().to_string(),
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +51,6 @@ pub struct ShaderModule<A: HalApi> {
|
|||||||
pub(crate) device: Arc<Device<A>>,
|
pub(crate) device: Arc<Device<A>>,
|
||||||
pub(crate) interface: Option<validation::Interface>,
|
pub(crate) interface: Option<validation::Interface>,
|
||||||
pub(crate) info: ResourceInfo<ShaderModule<A>>,
|
pub(crate) info: ResourceInfo<ShaderModule<A>>,
|
||||||
pub(crate) label: String,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<A: HalApi> Drop for ShaderModule<A> {
|
impl<A: HalApi> Drop for ShaderModule<A> {
|
||||||
@ -79,10 +78,6 @@ impl<A: HalApi> Resource for ShaderModule<A> {
|
|||||||
fn as_info_mut(&mut self) -> &mut ResourceInfo<Self> {
|
fn as_info_mut(&mut self) -> &mut ResourceInfo<Self> {
|
||||||
&mut self.info
|
&mut self.info
|
||||||
}
|
}
|
||||||
|
|
||||||
fn label(&self) -> &str {
|
|
||||||
&self.label
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<A: HalApi> ParentDevice<A> for ShaderModule<A> {
|
impl<A: HalApi> ParentDevice<A> for ShaderModule<A> {
|
||||||
|
Loading…
Reference in New Issue
Block a user