diff options
author | Samson <16504129+sagudev@users.noreply.github.com> | 2024-05-22 18:47:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-22 16:47:35 +0000 |
commit | 794110ebe58ad72d809291e9feb3f2cc92819941 (patch) | |
tree | 9c01451fa022f433fa8a305d58c2a79da747e838 /components/webgpu/gpu_error.rs | |
parent | 9f32809671c8c8e79d59c95194dcc466452299fc (diff) | |
download | servo-794110ebe58ad72d809291e9feb3f2cc92819941.tar.gz servo-794110ebe58ad72d809291e9feb3f2cc92819941.zip |
webgpu: Move errorscopes to WGPU thread (#32304)
* Prepare errorscopes logic in wgpu_thread
* remove scope_id from ipc
* new GPUErrors per spec
* remove cotent timeline error_scope
* fixup poperrorscope types
* device_scope -> gpu_error and nice errors
* Handle errors detection more elegantly
* good expectations
* new expectations
* Make error_scope.errors Vec as per spec
Diffstat (limited to 'components/webgpu/gpu_error.rs')
-rw-r--r-- | components/webgpu/gpu_error.rs | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/components/webgpu/gpu_error.rs b/components/webgpu/gpu_error.rs new file mode 100644 index 00000000000..173598e1c8e --- /dev/null +++ b/components/webgpu/gpu_error.rs @@ -0,0 +1,100 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +//! Error scopes and GPUError types + +use std::fmt; + +use serde::{Deserialize, Serialize}; + +use crate::wgc; + +/// <https://www.w3.org/TR/webgpu/#gpu-error-scope> +#[derive(Clone, Debug, Eq, Hash, PartialEq)] +pub(crate) struct ErrorScope { + pub errors: Vec<Error>, + pub filter: ErrorFilter, +} + +impl ErrorScope { + pub fn new(filter: ErrorFilter) -> Self { + Self { + filter, + errors: Vec::new(), + } + } +} + +/// <https://www.w3.org/TR/webgpu/#enumdef-gpuerrorfilter> +#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)] +pub enum ErrorFilter { + Validation, + OutOfMemory, + Internal, +} + +/// <https://www.w3.org/TR/webgpu/#gpuerror> +#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)] +pub enum Error { + Validation(String), + OutOfMemory(String), + Internal(String), +} + +impl std::error::Error for Error { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + None + } +} + +impl fmt::Display for Error { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.write_str(self.message()) + } +} + +impl Error { + pub fn filter(&self) -> ErrorFilter { + match self { + Error::Validation(_) => ErrorFilter::Validation, + Error::OutOfMemory(_) => ErrorFilter::OutOfMemory, + Error::Internal(_) => ErrorFilter::Internal, + } + } + + pub fn message(&self) -> &str { + match self { + Error::Validation(m) => m, + Error::OutOfMemory(m) => m, + Error::Internal(m) => m, + } + } + + // TODO: labels + // based on https://github.com/gfx-rs/wgpu/blob/trunk/wgpu/src/backend/wgpu_core.rs#L289 + pub fn from_error<E: std::error::Error + 'static>(error: E) -> Self { + let mut source_opt: Option<&(dyn std::error::Error + 'static)> = Some(&error); + while let Some(source) = source_opt { + if let Some(wgc::device::DeviceError::OutOfMemory) = + source.downcast_ref::<wgc::device::DeviceError>() + { + return Self::OutOfMemory(error.to_string()); + } + source_opt = source.source(); + } + // TODO: This hack is needed because there are + // multiple OutOfMemory error variant in wgpu-core + // and even upstream does not handle them correctly + if format!("{error:?}").contains("OutOfMemory") { + return Self::OutOfMemory(error.to_string()); + } + Self::Validation(error.to_string()) + } +} + +#[derive(Clone, Copy, Debug, Deserialize, Serialize)] +pub enum PopError { + Lost, + Empty, +} |