mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-19 05:51:03 +01:00
chore(deno_webgpu): Removed unnecessary vec (#9071)
This commit is contained in:
1 parent
910ef131ac
commit
7baace517b
2 files changed
+8
-5
No files matched your search
@@ -732,7 +732,7 @@ impl GPUDevice {
|
||||
.scopes
|
||||
.lock()
|
||||
.unwrap()
|
||||
.push((filter, vec![]));
|
||||
.push((filter, None));
|
||||
}
|
||||
|
||||
#[async_method(fake)]
|
||||
@@ -746,7 +746,7 @@ impl GPUDevice {
|
||||
return Ok(v8::Global::new(scope, val));
|
||||
}
|
||||
|
||||
let Some((_, errors)) = self.error_handler.scopes.lock().unwrap().pop()
|
||||
let Some((_, error)) = self.error_handler.scopes.lock().unwrap().pop()
|
||||
else {
|
||||
return Err(JsErrorBox::new(
|
||||
"DOMExceptionOperationError",
|
||||
@@ -754,7 +754,7 @@ impl GPUDevice {
|
||||
));
|
||||
};
|
||||
|
||||
let val = if let Some(err) = errors.into_iter().next() {
|
||||
let val = if let Some(err) = error {
|
||||
deno_core::error::to_v8_error(scope, &err)
|
||||
} else {
|
||||
v8::null(scope).into()
|
||||
|
||||
@@ -45,7 +45,7 @@ pub type ErrorHandler = std::rc::Rc<DeviceErrorHandler>;
|
||||
|
||||
pub struct DeviceErrorHandler {
|
||||
pub is_lost: OnceLock<()>,
|
||||
pub scopes: Mutex<Vec<(GPUErrorFilter, Vec<GPUError>)>>,
|
||||
pub scopes: Mutex<Vec<(GPUErrorFilter, Option<GPUError>)>>,
|
||||
lost_resolver: Mutex<Option<v8::Global<v8::PromiseResolver>>>,
|
||||
spawner: V8TaskSpawner,
|
||||
|
||||
@@ -111,7 +111,10 @@ impl DeviceErrorHandler {
|
||||
.rfind(|(filter, _)| filter == &error_filter);
|
||||
|
||||
if let Some(scope) = scope {
|
||||
scope.1.push(err);
|
||||
// Only saving the first error in the scope as it's likely the culprit.
|
||||
if scope.1.is_none() {
|
||||
scope.1 = Some(err);
|
||||
}
|
||||
} else {
|
||||
let device = self
|
||||
.device
|
||||
|
||||
Reference in new issue
Block a user