From 040404c80b4837ee6780a9e35eb67f851914f22d Mon Sep 17 00:00:00 2001 From: sagudev <16504129+sagudev@users.noreply.github.com> Date: Thu, 3 Sep 2026 13:20:02 +0200 Subject: [PATCH] [deno] Use label from wgc Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- deno_webgpu/adapter.rs | 2 -- deno_webgpu/bind_group.rs | 4 ++-- deno_webgpu/bind_group_layout.rs | 4 ++-- deno_webgpu/buffer.rs | 5 ++--- deno_webgpu/command_buffer.rs | 4 ++-- deno_webgpu/command_encoder.rs | 5 ++--- deno_webgpu/compute_pipeline.rs | 5 ++--- deno_webgpu/device.rs | 32 +++++--------------------------- deno_webgpu/pipeline_layout.rs | 4 ++-- deno_webgpu/query_set.rs | 4 ++-- deno_webgpu/queue.rs | 5 ++--- deno_webgpu/render_pipeline.rs | 6 ++---- deno_webgpu/sampler.rs | 4 ++-- deno_webgpu/shader.rs | 4 ++-- deno_webgpu/surface.rs | 1 - deno_webgpu/texture.rs | 13 ++++--------- 16 files changed, 33 insertions(+), 69 deletions(-) diff --git a/deno_webgpu/adapter.rs b/deno_webgpu/adapter.rs index ba247b20f..a11a9cb2b 100644 --- a/deno_webgpu/adapter.rs +++ b/deno_webgpu/adapter.rs @@ -223,7 +223,6 @@ impl GPUAdapter { let queue_obj = deno_core::cppgc::make_cppgc_object( scope, GPUQueue { - label: descriptor.label.clone(), wgpu_queue: queue, wgpu_device: wgpu_device.clone(), }, @@ -232,7 +231,6 @@ impl GPUAdapter { let device = GPUDevice { wgpu_device: wgpu_device.clone(), - label: descriptor.label, queue_obj, adapter_info: self.info.clone(), error_handler, diff --git a/deno_webgpu/bind_group.rs b/deno_webgpu/bind_group.rs index 908181a56..2d269cd45 100644 --- a/deno_webgpu/bind_group.rs +++ b/deno_webgpu/bind_group.rs @@ -14,6 +14,7 @@ use deno_core::webidl::WebIdlError; use deno_core::webidl::WebIdlInterfaceConverter; use deno_core::GarbageCollected; use deno_core::WebIDL; +use wgpu_core::resource::Labeled; use crate::buffer::GPUBuffer; use crate::error::GPUGenericError; @@ -24,7 +25,6 @@ use crate::texture::GPUTextureView; pub struct GPUBindGroup { pub wgpu_bind_group: Arc, - pub label: String, } impl WebIdlInterfaceConverter for GPUBindGroup { @@ -48,7 +48,7 @@ impl GPUBindGroup { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_bind_group.label().to_string() } #[setter] #[string] diff --git a/deno_webgpu/bind_group_layout.rs b/deno_webgpu/bind_group_layout.rs index 79b5517cb..bf53ab33a 100644 --- a/deno_webgpu/bind_group_layout.rs +++ b/deno_webgpu/bind_group_layout.rs @@ -5,6 +5,7 @@ use std::sync::Arc; use deno_core::op2; use deno_core::GarbageCollected; use deno_core::WebIDL; +use wgpu_core::resource::Labeled as _; use crate::error::GPUGenericError; use crate::texture::GPUTextureViewDimension; @@ -12,7 +13,6 @@ use crate::webidl::GPUShaderStageFlags; pub struct GPUBindGroupLayout { pub wgpu_bind_group_layout: Arc, - pub label: String, } impl deno_core::webidl::WebIdlInterfaceConverter for GPUBindGroupLayout { @@ -36,7 +36,7 @@ impl GPUBindGroupLayout { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_bind_group_layout.label().to_string() } #[setter] #[string] diff --git a/deno_webgpu/buffer.rs b/deno_webgpu/buffer.rs index d1e52cfd2..77b38167a 100644 --- a/deno_webgpu/buffer.rs +++ b/deno_webgpu/buffer.rs @@ -13,6 +13,7 @@ use deno_core::GarbageCollected; use deno_core::WebIDL; use deno_error::JsErrorBox; use wgpu_core::device::HostMap as MapMode; +use wgpu_core::resource::Labeled as _; use crate::error::GPUGenericError; @@ -63,8 +64,6 @@ pub struct GPUBuffer { pub wgpu_buffer: Arc, pub wgpu_device: Arc, - pub label: String, - pub size: u64, pub usage: u32, @@ -95,7 +94,7 @@ impl GPUBuffer { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_buffer.label().to_string() } #[setter] #[string] diff --git a/deno_webgpu/command_buffer.rs b/deno_webgpu/command_buffer.rs index 75b0056e7..afb35924a 100644 --- a/deno_webgpu/command_buffer.rs +++ b/deno_webgpu/command_buffer.rs @@ -5,12 +5,12 @@ use std::sync::Arc; use deno_core::op2; use deno_core::GarbageCollected; use deno_core::WebIDL; +use wgpu_core::resource::Labeled as _; use crate::error::GPUGenericError; pub struct GPUCommandBuffer { pub wgpu_command_buffer: Arc, - pub label: String, } impl deno_core::webidl::WebIdlInterfaceConverter for GPUCommandBuffer { @@ -34,7 +34,7 @@ impl GPUCommandBuffer { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_command_buffer.label().to_string() } #[setter] #[string] diff --git a/deno_webgpu/command_encoder.rs b/deno_webgpu/command_encoder.rs index 884278281..3e3cfb60d 100644 --- a/deno_webgpu/command_encoder.rs +++ b/deno_webgpu/command_encoder.rs @@ -15,6 +15,7 @@ use deno_core::GarbageCollected; use deno_core::WebIDL; use deno_error::JsErrorBox; use wgpu_core::command::PassChannel; +use wgpu_core::resource::Labeled as _; use wgpu_types::{BufferAddress, TexelCopyBufferInfo}; use crate::buffer::GPUBuffer; @@ -27,7 +28,6 @@ use crate::webidl::GPUExtent3D; pub struct GPUCommandEncoder { pub wgpu_command_encoder: Arc, - pub label: String, // Weak reference to the JS object so we can attach a finalizer. // See `GPUDevice::create_command_encoder`. @@ -52,7 +52,7 @@ impl GPUCommandEncoder { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_command_encoder.label().to_string() } #[setter] #[string] @@ -395,7 +395,6 @@ impl GPUCommandEncoder { GPUCommandBuffer { wgpu_command_buffer, - label: descriptor.label, } } diff --git a/deno_webgpu/compute_pipeline.rs b/deno_webgpu/compute_pipeline.rs index 4d7a2fe7c..50298f40b 100644 --- a/deno_webgpu/compute_pipeline.rs +++ b/deno_webgpu/compute_pipeline.rs @@ -8,6 +8,7 @@ use deno_core::webidl::WebIdlInterfaceConverter; use deno_core::GarbageCollected; use deno_core::WebIDL; use indexmap::IndexMap; +use wgpu_core::resource::Labeled as _; use crate::bind_group_layout::GPUBindGroupLayout; use crate::error::GPUGenericError; @@ -16,7 +17,6 @@ use crate::webidl::GPUPipelineLayoutOrGPUAutoLayoutMode; pub struct GPUComputePipeline { pub wgpu_compute_pipeline: Arc, - pub label: String, } impl WebIdlInterfaceConverter for GPUComputePipeline { @@ -40,7 +40,7 @@ impl GPUComputePipeline { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_compute_pipeline.label().to_string() } #[setter] #[string] @@ -56,7 +56,6 @@ impl GPUComputePipeline { // TODO(wgpu): needs to support retrieving the label GPUBindGroupLayout { wgpu_bind_group_layout, - label: "".to_string(), } } } diff --git a/deno_webgpu/device.rs b/deno_webgpu/device.rs index 14881c887..1ba667e71 100644 --- a/deno_webgpu/device.rs +++ b/deno_webgpu/device.rs @@ -15,6 +15,7 @@ use deno_error::JsErrorBox; use wgpu_core::binding_model::BindingResource; use wgpu_core::error::EmptyErrorScopeStack; use wgpu_core::pipeline::ProgrammableStageDescriptor; +use wgpu_core::resource::Labeled; use wgpu_types::BindingType; use super::bind_group::GPUBindGroup; @@ -48,8 +49,6 @@ pub struct GPUDevice { pub wgpu_device: Arc, pub wgpu_adapter: Arc, - pub label: String, - pub features: SameObject, pub limits: SameObject, pub adapter_info: Rc>, @@ -101,7 +100,7 @@ impl GPUDevice { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_device.label().to_string() } #[setter] #[string] @@ -193,7 +192,6 @@ impl GPUDevice { Ok(GPUBuffer { wgpu_buffer, wgpu_device: self.wgpu_device.clone(), - label: descriptor.label, size: descriptor.size, usage: descriptor.usage, map_state: RefCell::new(if descriptor.mapped_at_creation { @@ -251,7 +249,6 @@ impl GPUDevice { Ok(GPUTexture { wgpu_texture, default_view: Default::default(), - label: descriptor.label, size: wgpu_descriptor.size, mip_level_count: wgpu_descriptor.mip_level_count, sample_count: wgpu_descriptor.sample_count, @@ -286,10 +283,7 @@ impl GPUDevice { let wgpu_sampler = self.wgpu_device.create_sampler(&wgpu_descriptor); - Ok(GPUSampler { - wgpu_sampler, - label: descriptor.label, - }) + Ok(GPUSampler { wgpu_sampler }) } #[reentrant] @@ -366,7 +360,6 @@ impl GPUDevice { Ok(GPUBindGroupLayout { wgpu_bind_group_layout, - label: descriptor.label, }) } @@ -398,7 +391,6 @@ impl GPUDevice { GPUPipelineLayout { wgpu_pipeline_layout, - label: descriptor.label, } } @@ -455,10 +447,7 @@ impl GPUDevice { let wgpu_bind_group = self.wgpu_device.create_bind_group(&wgpu_descriptor); - GPUBindGroup { - wgpu_bind_group, - label: descriptor.label, - } + GPUBindGroup { wgpu_bind_group } } #[reentrant] @@ -491,7 +480,7 @@ impl GPUDevice { GPUShaderModule { wgpu_shader_module, - label: descriptor.label, + compilation_info, } } @@ -503,13 +492,11 @@ impl GPUDevice { &self, #[webidl] descriptor: super::compute_pipeline::GPUComputePipelineDescriptor, ) -> GPUComputePipeline { - let label = descriptor.label.clone(); let wgpu_descriptor = transform_compute_pipeline_descriptor(descriptor); let wgpu_compute_pipeline = self.wgpu_device.create_compute_pipeline(wgpu_descriptor); GPUComputePipeline { wgpu_compute_pipeline, - label, } } @@ -520,14 +507,12 @@ impl GPUDevice { &self, #[webidl] descriptor: super::render_pipeline::GPURenderPipelineDescriptor, ) -> Result { - let label = descriptor.label.clone(); let wgpu_descriptor = self.transform_render_pipeline_descriptor(descriptor)?; let wgpu_render_pipeline = self.wgpu_device.create_render_pipeline(wgpu_descriptor); Ok(GPURenderPipeline { wgpu_render_pipeline, - label, }) } @@ -544,7 +529,6 @@ impl GPUDevice { let resolver = v8::PromiseResolver::new(scope).unwrap(); let promise = resolver.get_promise(scope); - let label = descriptor.label.clone(); let wgpu_descriptor = transform_compute_pipeline_descriptor(descriptor); match self .wgpu_device @@ -553,7 +537,6 @@ impl GPUDevice { Ok(wgpu_compute_pipeline) => { let pipeline = GPUComputePipeline { wgpu_compute_pipeline, - label, }; let val = make_cppgc_object(scope, pipeline).into(); resolver.resolve(scope, val); @@ -581,8 +564,6 @@ impl GPUDevice { scope: &mut v8::HandleScope, #[webidl] descriptor: super::render_pipeline::GPURenderPipelineDescriptor, ) -> Result, JsErrorBox> { - let label = descriptor.label.clone(); - let wgpu_descriptor = self.transform_render_pipeline_descriptor(descriptor)?; @@ -596,7 +577,6 @@ impl GPUDevice { Ok(wgpu_render_pipeline) => { let render_pipeline = GPURenderPipeline { wgpu_render_pipeline, - label, }; let val = make_cppgc_object(scope, render_pipeline).into(); resolver.resolve(scope, val); @@ -642,7 +622,6 @@ impl GPUDevice { let encoder = GPUCommandEncoder { wgpu_command_encoder, - label, #[cfg(target_vendor = "apple")] weak: std::sync::OnceLock::new(), }; @@ -751,7 +730,6 @@ impl GPUDevice { wgpu_query_set, r#type: descriptor.r#type, count: descriptor.count, - label: descriptor.label, }) } diff --git a/deno_webgpu/pipeline_layout.rs b/deno_webgpu/pipeline_layout.rs index 34b32fe5b..62619c377 100644 --- a/deno_webgpu/pipeline_layout.rs +++ b/deno_webgpu/pipeline_layout.rs @@ -7,12 +7,12 @@ use deno_core::webidl::WebIdlInterfaceConverter; use deno_core::GarbageCollected; use deno_core::WebIDL; use std::sync::Arc; +use wgpu_core::resource::Labeled as _; use crate::error::GPUGenericError; pub struct GPUPipelineLayout { pub wgpu_pipeline_layout: Arc, - pub label: String, } impl WebIdlInterfaceConverter for GPUPipelineLayout { @@ -36,7 +36,7 @@ impl GPUPipelineLayout { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_pipeline_layout.label().to_string() } #[setter] #[string] diff --git a/deno_webgpu/query_set.rs b/deno_webgpu/query_set.rs index 17467a47e..c1f4d106e 100644 --- a/deno_webgpu/query_set.rs +++ b/deno_webgpu/query_set.rs @@ -7,6 +7,7 @@ use deno_core::webidl::WebIdlInterfaceConverter; use deno_core::GarbageCollected; use deno_core::WebIDL; use deno_error::JsErrorBox; +use wgpu_core::resource::Labeled; use crate::error::GPUGenericError; @@ -14,7 +15,6 @@ pub struct GPUQuerySet { pub wgpu_query_set: Arc, pub r#type: GPUQueryType, pub count: u32, - pub label: String, } impl WebIdlInterfaceConverter for GPUQuerySet { @@ -38,7 +38,7 @@ impl GPUQuerySet { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_query_set.label().to_string() } #[setter] #[string] diff --git a/deno_webgpu/queue.rs b/deno_webgpu/queue.rs index 53e42590c..64b9c7def 100644 --- a/deno_webgpu/queue.rs +++ b/deno_webgpu/queue.rs @@ -12,6 +12,7 @@ use deno_core::v8; use deno_core::GarbageCollected; use deno_core::WebIDL; use deno_error::JsErrorBox; +use wgpu_core::resource::Labeled; use crate::buffer::GPUBuffer; use crate::command_buffer::GPUCommandBuffer; @@ -23,8 +24,6 @@ use crate::webidl::GPUExtent3D; use crate::webidl::GPUOrigin3D; pub struct GPUQueue { - pub label: String, - pub wgpu_queue: Arc, pub wgpu_device: Arc, } @@ -46,7 +45,7 @@ impl GPUQueue { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_queue.label().to_string() } #[setter] #[string] diff --git a/deno_webgpu/render_pipeline.rs b/deno_webgpu/render_pipeline.rs index bfbe9d89e..b39923d54 100644 --- a/deno_webgpu/render_pipeline.rs +++ b/deno_webgpu/render_pipeline.rs @@ -9,6 +9,7 @@ use deno_core::webidl::WebIdlInterfaceConverter; use deno_core::GarbageCollected; use deno_core::WebIDL; use indexmap::IndexMap; +use wgpu_core::resource::Labeled; use crate::bind_group_layout::GPUBindGroupLayout; use crate::error::GPUGenericError; @@ -20,7 +21,6 @@ use crate::webidl::GPUPipelineLayoutOrGPUAutoLayoutMode; pub struct GPURenderPipeline { pub wgpu_render_pipeline: Arc, - pub label: String, } impl WebIdlInterfaceConverter for GPURenderPipeline { @@ -44,7 +44,7 @@ impl GPURenderPipeline { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_render_pipeline.label().to_string() } #[setter] #[string] @@ -57,10 +57,8 @@ impl GPURenderPipeline { let wgpu_bind_group_layout = self.wgpu_render_pipeline.get_bind_group_layout(index); - // TODO(wgpu): needs to add a way to retrieve the label GPUBindGroupLayout { wgpu_bind_group_layout, - label: "".to_string(), } } } diff --git a/deno_webgpu/sampler.rs b/deno_webgpu/sampler.rs index 942b1ff5a..fe8e577e9 100644 --- a/deno_webgpu/sampler.rs +++ b/deno_webgpu/sampler.rs @@ -6,12 +6,12 @@ use deno_core::op2; use deno_core::webidl::WebIdlInterfaceConverter; use deno_core::GarbageCollected; use deno_core::WebIDL; +use wgpu_core::resource::Labeled; use crate::error::GPUGenericError; pub struct GPUSampler { pub wgpu_sampler: Arc, - pub label: String, } impl WebIdlInterfaceConverter for GPUSampler { @@ -35,7 +35,7 @@ impl GPUSampler { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_sampler.label().to_string() } #[setter] #[string] diff --git a/deno_webgpu/shader.rs b/deno_webgpu/shader.rs index 011e74029..a64a787af 100644 --- a/deno_webgpu/shader.rs +++ b/deno_webgpu/shader.rs @@ -8,12 +8,12 @@ use deno_core::v8; use deno_core::webidl::WebIdlInterfaceConverter; use deno_core::GarbageCollected; use deno_core::WebIDL; +use wgpu_core::resource::Labeled; use crate::error::GPUGenericError; pub struct GPUShaderModule { pub wgpu_shader_module: Arc, - pub label: String, pub compilation_info: v8::Global, } @@ -38,7 +38,7 @@ impl GPUShaderModule { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_shader_module.label().to_string() } #[setter] #[string] diff --git a/deno_webgpu/surface.rs b/deno_webgpu/surface.rs index b3911ea31..191e19ebf 100644 --- a/deno_webgpu/surface.rs +++ b/deno_webgpu/surface.rs @@ -150,7 +150,6 @@ impl GPUCanvasContext { let texture = GPUTexture { wgpu_texture: output.texture.unwrap(), default_view: Default::default(), - label: "".to_string(), size: wgpu_types::Extent3d { width: *self.width.borrow(), height: *self.height.borrow(), diff --git a/deno_webgpu/texture.rs b/deno_webgpu/texture.rs index 9160b3c4f..fa777b982 100644 --- a/deno_webgpu/texture.rs +++ b/deno_webgpu/texture.rs @@ -8,6 +8,7 @@ use deno_core::webidl::WebIdlInterfaceConverter; use deno_core::GarbageCollected; use deno_core::WebIDL; use deno_error::JsErrorBox; +use wgpu_core::resource::Labeled; use wgpu_core::resource::ParentDevice; use wgpu_types::AstcBlock; use wgpu_types::AstcChannel; @@ -46,8 +47,6 @@ pub struct GPUTexture { pub wgpu_texture: Arc, pub default_view: OnceLock>, - pub label: String, - pub size: Extent3d, pub mip_level_count: u32, pub sample_count: u32, @@ -86,7 +85,7 @@ impl GPUTexture { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_texture.label().to_string() } #[setter] #[string] @@ -168,10 +167,7 @@ impl GPUTexture { let wgpu_texture_view = self.wgpu_texture.create_view(&wgpu_descriptor); - Ok(GPUTextureView { - wgpu_texture_view, - label: descriptor.label, - }) + Ok(GPUTextureView { wgpu_texture_view }) } } @@ -251,7 +247,6 @@ impl From for TextureAspect { pub struct GPUTextureView { pub wgpu_texture_view: Arc, - pub label: String, } impl WebIdlInterfaceConverter for GPUTextureView { @@ -276,7 +271,7 @@ impl GPUTextureView { #[getter] #[string] fn label(&self) -> String { - self.label.clone() + self.wgpu_texture_view.label().to_string() } #[setter] #[string]