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 ResourceInfo.label()

Browse Source
This commit is contained in:
teoxoy 2024-06-21 12:31:06 +02:00 committed by Teodor Tanasoaia
parent c4e067b394
commit 8106028f23
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wgpu-core/src/command/mod.rs
View File

@ -506,10 +506,7 @@ impl<A: HalApi> CommandBuffer<A> {
} }
pub(crate) fn extract_baked_commands(&mut self) -> BakedCommands<A> { pub(crate) fn extract_baked_commands(&mut self) -> BakedCommands<A> {
log::trace!( log::trace!("Extracting BakedCommands from {}", self.error_ident());
"Extracting BakedCommands from CommandBuffer {:?}",
self.info.label()
);
let data = self.data.lock().take().unwrap(); let data = self.data.lock().take().unwrap();
BakedCommands { BakedCommands {
encoder: data.encoder.raw, encoder: data.encoder.raw,

2
wgpu-core/src/device/resource.rs
View File

@ -151,7 +151,7 @@ pub(crate) enum DeferredDestroy<A: HalApi> {
impl<A: HalApi> std::fmt::Debug for Device<A> { impl<A: HalApi> std::fmt::Debug for Device<A> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("Device") f.debug_struct("Device")
.field("adapter", &self.adapter.info.label()) .field("label", &self.info.label)
.field("limits", &self.limits) .field("limits", &self.limits)
.field("features", &self.features) .field("features", &self.features)
.field("downlevel", &self.downlevel) .field("downlevel", &self.downlevel)

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

@ -103,21 +103,6 @@ impl<T: Resource> ResourceInfo<T> {
} }
} }
pub(crate) fn label(&self) -> &dyn Debug
where
Id<T::Marker>: Debug,
{
if !self.label.is_empty() {
return &self.label;
}
if let Some(id) = &self.id {
return id;
}
&""
}
pub(crate) fn id(&self) -> Id<T::Marker> { pub(crate) fn id(&self) -> Id<T::Marker> {
self.id.unwrap() self.id.unwrap()
} }