Communicate WebGPU label attribute changes to Dawn

This change forwards label changes to Dawn for every object that has *SetLabel() implemented. Does not include Device or Queue, since those will require https://dawn-review.googlesource.com/c/dawn/+/85540 to land first but doing so requires the command_buffer change from this patch. Bug: dawn:840 Change-Id: I1ab173e4d036fea49f7d7343a29ffefdc4b301bb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565481 Reviewed-by: Austin Eng <enga@chromium.org> Commit-Queue: Brandon Jones <bajones@chromium.org> Cr-Commit-Position: refs/heads/main@{#988194}
chromium · Apr 2, 2022 · 1cdda74 · 1cdda74
1 parent 987b4b3
commit 1cdda74
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 1 deletion.
diff --git a/gpu/command_buffer/service/webgpu_decoder_impl.cc b/gpu/command_buffer/service/webgpu_decoder_impl.cc
@@ -1061,7 +1061,7 @@ void WebGPUDecoderImpl::DoRequestDevice(
   DCHECK_LT(static_cast<size_t>(requested_adapter_index),
             dawn_adapters_.size());
 
-  WGPUDeviceDescriptor device_descriptor;
+  WGPUDeviceDescriptor device_descriptor = {};
 
   // We need to request internal usage to be able to do operations with internal
   // methods that would need specific usages.

diff --git a/third_party/blink/renderer/modules/webgpu/dawn_object.cc b/third_party/blink/renderer/modules/webgpu/dawn_object.cc
@@ -36,6 +36,7 @@ void DawnObjectBase::setLabel(ScriptState* script_state,
 void DawnObjectBase::setLabel(const String& value) {
   // TODO: Relay label changes to Dawn
   label_ = value;
+  setLabelImpl(value);
 }
 
 void DawnObjectBase::EnsureFlush() {

diff --git a/third_party/blink/renderer/modules/webgpu/dawn_object.h b/third_party/blink/renderer/modules/webgpu/dawn_object.h
@@ -104,6 +104,8 @@ class DawnObjectBase {
 
   void setLabel(const String& value);
 
+  virtual void setLabelImpl(const String& value){};
+
  private:
   scoped_refptr<DawnControlClientHolder> dawn_control_client_;
   String label_;

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_bind_group.h b/third_party/blink/renderer/modules/webgpu/gpu_bind_group.h
@@ -23,6 +23,11 @@ class GPUBindGroup : public DawnObject<WGPUBindGroup> {
 
   GPUBindGroup(const GPUBindGroup&) = delete;
   GPUBindGroup& operator=(const GPUBindGroup&) = delete;
+
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().bindGroupSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout.h b/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout.h
@@ -25,6 +25,11 @@ class GPUBindGroupLayout : public DawnObject<WGPUBindGroupLayout> {
 
   GPUBindGroupLayout(const GPUBindGroupLayout&) = delete;
   GPUBindGroupLayout& operator=(const GPUBindGroupLayout&) = delete;
+
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().bindGroupLayoutSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_buffer.h b/third_party/blink/renderer/modules/webgpu/gpu_buffer.h
@@ -77,6 +77,11 @@ class GPUBuffer : public DawnObject<WGPUBuffer> {
       ExecutionContext* execution_context);
   void ResetMappingState(v8::Isolate* isolate);
 
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().bufferSetLabel(GetHandle(), utf8_label.c_str());
+  }
+
   uint64_t size_;
 
   // Holds onto any ArrayBuffers returned by getMappedRange, mapReadAsync, or

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_command_buffer.h b/third_party/blink/renderer/modules/webgpu/gpu_command_buffer.h
@@ -18,6 +18,12 @@ class GPUCommandBuffer : public DawnObject<WGPUCommandBuffer> {
 
   GPUCommandBuffer(const GPUCommandBuffer&) = delete;
   GPUCommandBuffer& operator=(const GPUCommandBuffer&) = delete;
+
+ private:
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().commandBufferSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.h b/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.h
@@ -94,6 +94,11 @@ class GPUCommandEncoder : public DawnObject<WGPUCommandEncoder> {
                                          offset, size);
   }
   GPUCommandBuffer* finish(const GPUCommandBufferDescriptor* descriptor);
+
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().commandEncoderSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_compute_pass_encoder.h b/third_party/blink/renderer/modules/webgpu/gpu_compute_pass_encoder.h
@@ -72,6 +72,11 @@ class GPUComputePassEncoder : public DawnObject<WGPUComputePassEncoder>,
   }
   void end() { GetProcs().computePassEncoderEnd(GetHandle()); }
   void endPass();
+
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().computePassEncoderSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_compute_pipeline.h b/third_party/blink/renderer/modules/webgpu/gpu_compute_pipeline.h
@@ -32,6 +32,11 @@ class GPUComputePipeline : public DawnObject<WGPUComputePipeline> {
   GPUComputePipeline& operator=(const GPUComputePipeline&) = delete;
 
   GPUBindGroupLayout* getBindGroupLayout(uint32_t index);
+
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().computePipelineSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_external_texture.h b/third_party/blink/renderer/modules/webgpu/gpu_external_texture.h
@@ -33,6 +33,11 @@ class GPUExternalTexture : public DawnObject<WGPUExternalTexture> {
   void Destroy();
 
  private:
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().externalTextureSetLabel(GetHandle(), utf8_label.c_str());
+  }
+
   scoped_refptr<WebGPUMailboxTexture> mailbox_texture_;
 };
 

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_query_set.h b/third_party/blink/renderer/modules/webgpu/gpu_query_set.h
@@ -25,6 +25,12 @@ class GPUQuerySet : public DawnObject<WGPUQuerySet> {
 
   // gpu_queryset.idl
   void destroy();
+
+ private:
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().querySetSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_render_bundle_encoder.h b/third_party/blink/renderer/modules/webgpu/gpu_render_bundle_encoder.h
@@ -120,6 +120,11 @@ class GPURenderBundleEncoder : public DawnObject<WGPURenderBundleEncoder>,
   }
 
   GPURenderBundle* finish(const GPURenderBundleDescriptor* webgpu_desc);
+
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().renderBundleEncoderSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_render_pass_encoder.h b/third_party/blink/renderer/modules/webgpu/gpu_render_pass_encoder.h
@@ -144,6 +144,11 @@ class GPURenderPassEncoder : public DawnObject<WGPURenderPassEncoder>,
   }
   void end() { GetProcs().renderPassEncoderEnd(GetHandle()); }
   void endPass();
+
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().renderPassEncoderSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_render_pipeline.h b/third_party/blink/renderer/modules/webgpu/gpu_render_pipeline.h
@@ -92,6 +92,12 @@ class GPURenderPipeline : public DawnObject<WGPURenderPipeline> {
   GPURenderPipeline& operator=(const GPURenderPipeline&) = delete;
 
   GPUBindGroupLayout* getBindGroupLayout(uint32_t index);
+
+ private:
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().renderPipelineSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_sampler.h b/third_party/blink/renderer/modules/webgpu/gpu_sampler.h
@@ -21,6 +21,12 @@ class GPUSampler : public DawnObject<WGPUSampler> {
 
   GPUSampler(const GPUSampler&) = delete;
   GPUSampler& operator=(const GPUSampler&) = delete;
+
+ private:
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().samplerSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_shader_module.h b/third_party/blink/renderer/modules/webgpu/gpu_shader_module.h
@@ -34,6 +34,11 @@ class GPUShaderModule : public DawnObject<WGPUShaderModule> {
   void OnCompilationInfoCallback(ScriptPromiseResolver* resolver,
                                  WGPUCompilationInfoRequestStatus status,
                                  const WGPUCompilationInfo* info);
+
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().shaderModuleSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_texture.h b/third_party/blink/renderer/modules/webgpu/gpu_texture.h
@@ -53,6 +53,11 @@ class GPUTexture : public DawnObject<WGPUTexture> {
   WGPUTextureUsage Usage() { return usage_; }
 
  private:
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().textureSetLabel(GetHandle(), utf8_label.c_str());
+  }
+
   WGPUTextureDimension dimension_;
   WGPUTextureFormat format_;
   WGPUTextureUsage usage_;

diff --git a/third_party/blink/renderer/modules/webgpu/gpu_texture_view.h b/third_party/blink/renderer/modules/webgpu/gpu_texture_view.h
@@ -17,6 +17,12 @@ class GPUTextureView : public DawnObject<WGPUTextureView> {
 
   GPUTextureView(const GPUTextureView&) = delete;
   GPUTextureView& operator=(const GPUTextureView&) = delete;
+
+ private:
+  void setLabelImpl(const String& value) override {
+    std::string utf8_label = value.Utf8();
+    GetProcs().textureViewSetLabel(GetHandle(), utf8_label.c_str());
+  }
 };
 
 }  // namespace blink