diff --git a/wgpu-core/src/device/resource.rs b/wgpu-core/src/device/resource.rs index 27eb6dbcd..171ad1882 100644 --- a/wgpu-core/src/device/resource.rs +++ b/wgpu-core/src/device/resource.rs @@ -5638,9 +5638,8 @@ impl Device { raw: Snatchable::new(raw), }), device: self.clone(), - label: desc.label.to_string(), tracking_data: TrackingData::new(self.tracker_indices.query_sets.clone()), - desc: desc.map_label(|_| ()), + desc: desc.map_label(|l| l.to_string()), initialized_slots: Mutex::new( rank::QUERY_SET_INITIALIZED_SLOTS, bit_vec::BitVec::from_elem(desc.count as usize, false), diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs index 24a6b33b0..103df04af 100644 --- a/wgpu-core/src/resource.rs +++ b/wgpu-core/src/resource.rs @@ -3008,10 +3008,8 @@ pub(crate) struct QuerySetState { pub struct QuerySet { pub(crate) state: ResourceState, pub(crate) device: Arc, - /// The `label` from the descriptor used to create the resource. - pub(crate) label: String, pub(crate) tracking_data: TrackingData, - pub(crate) desc: wgt::QuerySetDescriptor<()>, + pub(crate) desc: wgt::QuerySetDescriptor, pub(crate) initialized_slots: Mutex, } @@ -3038,9 +3036,8 @@ impl QuerySet { pub fn invalid(device: Arc, desc: &QuerySetDescriptor) -> Arc { Arc::new(QuerySet { state: ResourceState::Invalid, - label: desc.label.to_string(), tracking_data: TrackingData::new(device.tracker_indices.query_sets.clone()), - desc: desc.clone().map_label(|_| ()), + desc: desc.map_label(|l| l.to_string()), initialized_slots: Mutex::new( rank::QUERY_SET_INITIALIZED_SLOTS, bit_vec::BitVec::new(), @@ -3123,7 +3120,11 @@ impl Drop for QuerySet { } crate::impl_resource_type!(QuerySet); -crate::impl_labeled!(QuerySet); +impl Labeled for QuerySet { + fn label(&self) -> &str { + &self.desc.label + } +} crate::impl_parent_device!(QuerySet); crate::impl_storage_item!(QuerySet); crate::impl_trackable!(QuerySet);