From e2f2b2ebe812e4ded0e4901509ac76af0edd2768 Mon Sep 17 00:00:00 2001 From: Sam <16504129+sagudev@users.noreply.github.com> Date: Thu, 17 Sep 2026 17:02:04 +0200 Subject: [PATCH] [remote] Add `PipelineError` (#10369) Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- wgpu-core-remote-types/src/lib.rs | 9 +++++++++ wgpu-core-remote/src/global/device.rs | 19 +++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/wgpu-core-remote-types/src/lib.rs b/wgpu-core-remote-types/src/lib.rs index 46547c579..ae3d68598 100644 --- a/wgpu-core-remote-types/src/lib.rs +++ b/wgpu-core-remote-types/src/lib.rs @@ -146,3 +146,12 @@ pub struct ShaderModuleDescriptor<'a> { pub type QuerySetDescriptor<'a> = wgt::QuerySetDescriptor>; pub use naga_types::wgsl::language_extension::ImplementedLanguageExtension; + +/// Describes a pipeline creation error. +/// +/// Corresponds to [WebGPU `GPUPipelineError`](https://www.w3.org/TR/webgpu/#gpupipelineerror). +#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)] +pub enum PipelineError { + Validation(String), + Internal(String), +} diff --git a/wgpu-core-remote/src/global/device.rs b/wgpu-core-remote/src/global/device.rs index a852bf348..1076755f0 100644 --- a/wgpu-core-remote/src/global/device.rs +++ b/wgpu-core-remote/src/global/device.rs @@ -4,8 +4,9 @@ use core::ptr::NonNull; use wgpu_core_remote_types::{ encoders::{RenderBundleDescriptor, RenderBundleEncoderDescriptor}, pipelines::{ComputePipelineDescriptor, RenderPipelineDescriptor}, - BufferDescriptor, ExternalTextureDescriptor, PipelineLayoutDescriptor, QuerySetDescriptor, - SamplerDescriptor, ShaderModuleDescriptor, TextureDescriptor, TextureViewDescriptor, + BufferDescriptor, ExternalTextureDescriptor, PipelineError, PipelineLayoutDescriptor, + QuerySetDescriptor, SamplerDescriptor, ShaderModuleDescriptor, TextureDescriptor, + TextureViewDescriptor, }; use wgpu_core::{ @@ -998,7 +999,7 @@ impl Global { device_id: DeviceId, desc: &RenderPipelineDescriptor, id_in: id::RenderPipelineId, - ) -> Result<(), pipeline::CreateRenderPipelineError> { + ) -> Result<(), PipelineError> { let mut hub = self.hub.borrow_mut(); let Hub { render_pipelines, @@ -1017,7 +1018,10 @@ impl Global { render_pipelines.assign(id_in, pipeline); Ok(()) } - Err(e) => Err(e), + Err(e) if e.webgpu_error_type() == wgt::error::ErrorType::Validation => { + Err(PipelineError::Validation(e.to_string())) + } + Err(e) => Err(PipelineError::Internal(e.to_string())), } } @@ -1102,7 +1106,7 @@ impl Global { device_id: DeviceId, desc: &ComputePipelineDescriptor, id_in: id::ComputePipelineId, - ) -> Result<(), pipeline::CreateComputePipelineError> { + ) -> Result<(), PipelineError> { let mut hub = self.hub.borrow_mut(); let Hub { compute_pipelines, @@ -1137,7 +1141,10 @@ impl Global { compute_pipelines.assign(id_in, pipeline); Ok(()) } - Err(e) => Err(e), + Err(e) if e.webgpu_error_type() == wgt::error::ErrorType::Validation => { + Err(PipelineError::Validation(e.to_string())) + } + Err(e) => Err(PipelineError::Internal(e.to_string())), } }