From 9b966bf8a39b07bfc495fb43e8bf7725c5df440c Mon Sep 17 00:00:00 2001 From: Andy Leiserson Date: Wed, 9 Jul 2025 09:56:57 -0700 Subject: [PATCH] Fix for destroyed resource errors --- cts_runner/test.lst | 2 ++ wgpu-core/src/command/mod.rs | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/cts_runner/test.lst b/cts_runner/test.lst index 6432ffdd3..c509d87bb 100644 --- a/cts_runner/test.lst +++ b/cts_runner/test.lst @@ -29,6 +29,8 @@ webgpu:api,validation,encoding,cmds,index_access:* //FAIL: webgpu:api,validation,encoding,cmds,render,draw:* webgpu:api,validation,encoding,cmds,render,draw:index_buffer_OOB:* webgpu:api,validation,encoding,cmds,render,draw:unused_buffer_bound:* +webgpu:api,validation,encoding,cmds,render,setIndexBuffer:index_buffer_state:* +webgpu:api,validation,encoding,cmds,render,setVertexBuffer:vertex_buffer_state:* webgpu:api,validation,encoding,encoder_state:* webgpu:api,validation,encoding,encoder_open_state:non_pass_commands:* webgpu:api,validation,encoding,encoder_open_state:render_pass_commands:* diff --git a/wgpu-core/src/command/mod.rs b/wgpu-core/src/command/mod.rs index 80133c5b8..9587669c7 100644 --- a/wgpu-core/src/command/mod.rs +++ b/wgpu-core/src/command/mod.rs @@ -31,6 +31,7 @@ pub use timestamp_writes::PassTimestampWrites; use self::memory_init::CommandBufferTextureMemoryActions; +use crate::binding_model::BindingError; use crate::command::transition_resources::TransitionResourcesError; use crate::device::queue::TempResource; use crate::device::{Device, DeviceError, MissingFeatures}; @@ -1060,6 +1061,18 @@ impl CommandEncoderError { inner: RenderPassErrorInner::DestroyedResource(_), .. }) + | Self::RenderPass(RenderPassError { + inner: RenderPassErrorInner::RenderCommand( + RenderCommandError::DestroyedResource(_) + ), + .. + }) + | Self::RenderPass(RenderPassError { + inner: RenderPassErrorInner::RenderCommand(RenderCommandError::BindingError( + BindingError::DestroyedResource(_) + )), + .. + }) ) } }