From ed57d2e82ae64f4bdae0bc7f4b9bdd4be6ea2cc8 Mon Sep 17 00:00:00 2001 From: Sam <16504129+sagudev@users.noreply.github.com> Date: Tue, 23 Jun 2026 15:18:24 +0200 Subject: [PATCH] [core] Use label field of TextureDescriptor (#9714) Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- wgpu-core/src/command/clear.rs | 4 ++-- wgpu-core/src/command/transfer.rs | 4 ++-- wgpu-core/src/init_tracker/texture.rs | 4 ++-- wgpu-core/src/resource.rs | 15 ++++++++------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/wgpu-core/src/command/clear.rs b/wgpu-core/src/command/clear.rs index b8c1d9fb3..eac7df65e 100644 --- a/wgpu-core/src/command/clear.rs +++ b/wgpu-core/src/command/clear.rs @@ -1,4 +1,4 @@ -use alloc::{sync::Arc, vec::Vec}; +use alloc::{string::String, sync::Arc, vec::Vec}; use core::ops::Range; use crate::{ @@ -370,7 +370,7 @@ pub(crate) fn clear_texture( } fn clear_texture_via_buffer_copies( - texture_desc: &wgt::TextureDescriptor<(), Vec>, + texture_desc: &wgt::TextureDescriptor>, alignments: &hal::Alignments, zero_buffer: &dyn hal::DynBuffer, // Buffer of size device::ZERO_BUFFER_SIZE range: TextureInitRange, diff --git a/wgpu-core/src/command/transfer.rs b/wgpu-core/src/command/transfer.rs index f3276d2f5..8c5b91607 100644 --- a/wgpu-core/src/command/transfer.rs +++ b/wgpu-core/src/command/transfer.rs @@ -451,7 +451,7 @@ pub(crate) fn validate_texture_copy_dst_format( pub(crate) fn validate_texture_buffer_copy( texture_copy_view: &wgt::TexelCopyTextureInfo, aspect: hal::FormatAspects, - desc: &wgt::TextureDescriptor<(), Vec>, + desc: &wgt::TextureDescriptor>, layout: &wgt::TexelCopyBufferLayout, aligned: bool, ) -> Result<(), TransferError> { @@ -502,7 +502,7 @@ pub(crate) fn validate_texture_buffer_copy( /// [vtcr]: https://gpuweb.github.io/gpuweb/#abstract-opdef-validating-texture-copy-range pub(crate) fn validate_texture_copy_range( texture_copy_view: &wgt::TexelCopyTextureInfo, - desc: &wgt::TextureDescriptor<(), Vec>, + desc: &wgt::TextureDescriptor>, texture_side: CopySide, copy_size: &Extent3d, ) -> Result<(hal::CopyExtent, u32), TransferError> { diff --git a/wgpu-core/src/init_tracker/texture.rs b/wgpu-core/src/init_tracker/texture.rs index 8f394db19..454e1d79b 100644 --- a/wgpu-core/src/init_tracker/texture.rs +++ b/wgpu-core/src/init_tracker/texture.rs @@ -1,6 +1,6 @@ use super::{InitTracker, MemoryInitKind}; use crate::resource::Texture; -use alloc::{sync::Arc, vec::Vec}; +use alloc::{string::String, sync::Arc, vec::Vec}; use arrayvec::ArrayVec; use core::ops::Range; use wgt::TextureSelector; @@ -18,7 +18,7 @@ pub(crate) struct TextureInitRange { pub(crate) fn has_copy_partial_init_tracker_coverage( copy_size: &wgt::Extent3d, copy_info: &wgt::TexelCopyTextureInfo, - desc: &wgt::TextureDescriptor<(), Vec>, + desc: &wgt::TextureDescriptor>, ) -> bool { let target_size = desc.mip_level_size(copy_info.mip_level).unwrap(); copy_size.width != target_size.width diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs index e55bdbcde..305c583cc 100644 --- a/wgpu-core/src/resource.rs +++ b/wgpu-core/src/resource.rs @@ -1357,13 +1357,11 @@ pub enum TextureClearMode { pub struct Texture { pub(crate) inner: Snatchable, pub(crate) device: Arc, - pub(crate) desc: wgt::TextureDescriptor<(), Vec>, + pub(crate) desc: wgt::TextureDescriptor>, pub(crate) _hal_usage: wgt::TextureUses, pub(crate) format_features: wgt::TextureFormatFeatures, pub(crate) initialization_status: RwLock, pub(crate) full_range: TextureSelector, - /// The `label` from the descriptor used to create the resource. - pub(crate) label: String, pub(crate) tracking_data: TrackingData, pub(crate) clear_mode: RwLock, pub(crate) views: Mutex>, @@ -1384,7 +1382,7 @@ impl Texture { Texture { inner: Snatchable::new(inner), device: device.clone(), - desc: desc.map_label(|_| ()), + desc: desc.map_label(|label| label.to_string()), _hal_usage: hal_usage, format_features, initialization_status: RwLock::new( @@ -1399,7 +1397,6 @@ impl Texture { mips: 0..desc.mip_level_count, layers: 0..desc.array_layer_count(), }, - label: desc.label.to_string(), tracking_data: TrackingData::new(device.tracker_indices.textures.clone()), clear_mode: RwLock::new(rank::TEXTURE_CLEAR_MODE, clear_mode), views: Mutex::new(rank::TEXTURE_VIEWS, WeakVec::new()), @@ -1491,7 +1488,7 @@ impl Texture { pub(crate) fn get_clear_view<'a>( clear_mode: &'a TextureClearMode, - desc: &'a wgt::TextureDescriptor<(), Vec>, + desc: &'a wgt::TextureDescriptor>, mip_level: u32, depth_or_layer: u32, ) -> &'a dyn hal::DynTextureView { @@ -1731,7 +1728,11 @@ pub enum CreateTextureError { } crate::impl_resource_type!(Texture); -crate::impl_labeled!(Texture); +impl Labeled for Texture { + fn label(&self) -> &str { + &self.desc.label + } +} crate::impl_parent_device!(Texture); crate::impl_storage_item!(Texture); crate::impl_trackable!(Texture);