nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 06:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove IDs from Destroyed{Buffer,Texture}

Browse Source
This commit is contained in:
teoxoy 2024-06-20 20:35:36 +02:00 committed by Teodor Tanasoaia
parent d5d806a474
commit bbf824767d
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wgpu-core/src/resource.rs
View File

@ -765,7 +765,6 @@ impl<A: HalApi> Buffer<A> {
raw: Some(raw), raw: Some(raw),
device: Arc::clone(&self.device), device: Arc::clone(&self.device),
submission_index: self.info.submission_index(), submission_index: self.info.submission_index(),
id: self.info.id.unwrap(),
tracker_index: self.info.tracker_index(), tracker_index: self.info.tracker_index(),
label: self.info.label.clone(), label: self.info.label.clone(),
bind_groups, bind_groups,
@ -832,7 +831,6 @@ pub struct DestroyedBuffer<A: HalApi> {
raw: Option<A::Buffer>, raw: Option<A::Buffer>,
device: Arc<Device<A>>, device: Arc<Device<A>>,
label: String, label: String,
pub(crate) id: BufferId,
pub(crate) tracker_index: TrackerIndex, pub(crate) tracker_index: TrackerIndex,
pub(crate) submission_index: u64, pub(crate) submission_index: u64,
bind_groups: Vec<Weak<BindGroup<A>>>, bind_groups: Vec<Weak<BindGroup<A>>>,
@ -840,11 +838,7 @@ pub struct DestroyedBuffer<A: HalApi> {
impl<A: HalApi> DestroyedBuffer<A> { impl<A: HalApi> DestroyedBuffer<A> {
pub fn label(&self) -> &dyn Debug { pub fn label(&self) -> &dyn Debug {
if !self.label.is_empty() { &self.label
return &self.label;
}
&self.id
} }
} }
@ -1144,7 +1138,6 @@ impl<A: HalApi> Texture<A> {
device: Arc::clone(&self.device), device: Arc::clone(&self.device),
tracker_index: self.info.tracker_index(), tracker_index: self.info.tracker_index(),
submission_index: self.info.submission_index(), submission_index: self.info.submission_index(),
id: self.info.id.unwrap(),
label: self.info.label.clone(), label: self.info.label.clone(),
})) }))
}; };
@ -1328,18 +1321,13 @@ pub struct DestroyedTexture<A: HalApi> {
bind_groups: Vec<Weak<BindGroup<A>>>, bind_groups: Vec<Weak<BindGroup<A>>>,
device: Arc<Device<A>>, device: Arc<Device<A>>,
label: String, label: String,
pub(crate) id: TextureId,
pub(crate) tracker_index: TrackerIndex, pub(crate) tracker_index: TrackerIndex,
pub(crate) submission_index: u64, pub(crate) submission_index: u64,
} }
impl<A: HalApi> DestroyedTexture<A> { impl<A: HalApi> DestroyedTexture<A> {
pub fn label(&self) -> &dyn Debug { pub fn label(&self) -> &dyn Debug {
if !self.label.is_empty() { &self.label
return &self.label;
}
&self.id
} }
} }