From c268540beee106cec6cada4fc2d506b809ab33e6 Mon Sep 17 00:00:00 2001 From: Sam <16504129+sagudev@users.noreply.github.com> Date: Fri, 4 Sep 2026 14:53:20 +0200 Subject: [PATCH] [core] public `*_pipeline_or_error` methods return invalid pipeline on lost device (#10260) --- wgpu-core/src/device/resource.rs | 38 ++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/wgpu-core/src/device/resource.rs b/wgpu-core/src/device/resource.rs index eb9e4f7e7..cdb2fd49b 100644 --- a/wgpu-core/src/device/resource.rs +++ b/wgpu-core/src/device/resource.rs @@ -19,8 +19,8 @@ use smallvec::SmallVec; use wgpu_sync::atomic::{AtomicBool, Ordering}; use wgpu_sync::OnceCell; use wgt::{ - math::align_to, ColorWrites, DeviceLostReason, TextureFormat, TextureSampleType, - TextureViewDimension, + error::WebGpuError, math::align_to, ColorWrites, DeviceLostReason, TextureFormat, + TextureSampleType, TextureViewDimension, }; #[cfg(feature = "trace")] @@ -4326,7 +4326,7 @@ impl Device { ) -> Arc { profiling::scope!("Device::create_compute_pipeline"); let compute_pipeline = self - .create_compute_pipeline_or_error(desc.clone()) + .create_compute_pipeline_or_error_inner(desc.clone()) .unwrap_or_else(|err| { if let pipeline::CreateComputePipelineError::Internal(ref error) = err { log::error!( @@ -4361,11 +4361,26 @@ impl Device { } /// Creates a compute pipeline without raising any error to device. + /// Device lost errors will be mapped to invalid compute pipeline + /// as required by specification. /// /// Corresponds to [GPUDevice.createComputePipelineAsync](https://www.w3.org/TR/webgpu/#dom-gpudevice-createcomputepipelineasync) pub fn create_compute_pipeline_or_error( self: &Arc, desc: pipeline::ComputePipelineDescriptor, + ) -> Result, pipeline::CreateComputePipelineError> { + let label = desc.label.to_string(); + match self.create_compute_pipeline_or_error_inner(desc) { + Err(err) if err.webgpu_error_type() == wgt::error::ErrorType::DeviceLost => { + Ok(pipeline::ComputePipeline::invalid(self.clone(), label)) + } + result => result, + } + } + + fn create_compute_pipeline_or_error_inner( + self: &Arc, + desc: pipeline::ComputePipelineDescriptor, ) -> Result, pipeline::CreateComputePipelineError> { self.check_is_valid()?; @@ -4523,7 +4538,7 @@ impl Device { profiling::scope!("Device::create_render_pipeline"); let render_pipeline = self - .create_render_pipeline_or_error(desc.clone()) + .create_render_pipeline_or_error_inner(desc.clone()) .unwrap_or_else(|err| { if let pipeline::CreateRenderPipelineError::Internal { stage, ref error } = err { log::error!("Shader translation error for stage {stage:?}: {error}"); @@ -4548,11 +4563,26 @@ impl Device { } /// Creates a render pipeline without raising any error to device. + /// Device lost errors will be mapped to invalid render pipeline + /// as required by specification. /// /// Corresponds to [GPUDevice.createRenderPipelineAsync](https://www.w3.org/TR/webgpu/#dom-gpudevice-createrenderpipelineasync) pub fn create_render_pipeline_or_error( self: &Arc, desc: pipeline::ResolvedGeneralRenderPipelineDescriptor, + ) -> Result, pipeline::CreateRenderPipelineError> { + let label = desc.label.to_string(); + match self.create_render_pipeline_or_error_inner(desc) { + Err(e) if e.webgpu_error_type() == wgt::error::ErrorType::DeviceLost => Ok( + pipeline::RenderPipeline::invalid(self.clone(), label.to_string()), + ), + result => result, + } + } + + fn create_render_pipeline_or_error_inner( + self: &Arc, + desc: pipeline::ResolvedGeneralRenderPipelineDescriptor, ) -> Result, pipeline::CreateRenderPipelineError> { use wgt::TextureFormatFeatureFlags as Tfff;