WIP: fix(deno)!: make create*PipelineAsync errors reject on the Promise

Author: ErichDonGubler

deno_webgpu/device.rs

@@ -6,13 +6,15 @@ use std::num::NonZeroU64;
 use std::rc::Rc;
 
 use deno_core::cppgc::{make_cppgc_object, SameObject};
-use deno_core::op2;
 use deno_core::v8;
 use deno_core::webidl::WebIdlInterfaceConverter;
 use deno_core::GarbageCollected;
+use deno_core::{anyhow, op2};
 use deno_error::JsErrorBox;
 use wgpu_core::binding_model::BindingResource;
-use wgpu_core::pipeline::ProgrammableStageDescriptor;
+use wgpu_core::pipeline::{
+  CreateRenderPipelineError, ProgrammableStageDescriptor,
+};
 use wgpu_types::BindingType;
 
 use super::bind_group::GPUBindGroup;
@@ -29,7 +31,10 @@ use crate::adapter::GPUAdapterInfo;
 use crate::adapter::GPUSupportedFeatures;
 use crate::adapter::GPUSupportedLimits;
 use crate::command_encoder::GPUCommandEncoder;
-use crate::error::{GPUError, GPUGenericError};
+use crate::error::{
+  GPUError, GPUGenericError, GPUPipelineError, GPUPipelineErrorInit,
+  GPUPipelineErrorReason,
+};
 use crate::query_set::GPUQuerySet;
 use crate::render_bundle::GPURenderBundleEncoder;
 use crate::render_pipeline::GPURenderPipeline;
@@ -509,7 +514,9 @@ impl GPUDevice {
     &self,
     #[webidl] descriptor: super::render_pipeline::GPURenderPipelineDescriptor,
   ) -> Result<GPURenderPipeline, JsErrorBox> {
-    self.new_render_pipeline(descriptor)
+    let (render_pipeline, err) = self.new_render_pipeline(descriptor)?;
+    self.error_handler.push_error(err);
+    Ok(render_pipeline)
   }
 
   #[async_method]
@@ -529,7 +536,27 @@ impl GPUDevice {
     &self,
     #[webidl] descriptor: super::render_pipeline::GPURenderPipelineDescriptor,
   ) -> Result<GPURenderPipeline, JsErrorBox> {
-    self.new_render_pipeline(descriptor)
+    let (render_pipeline, err) = self.new_render_pipeline(descriptor)?;
+    if let Some(err) = err {
+      use wgpu_types::error::ErrorType;
+      use wgpu_types::error::WebGpuError as _;
+
+      let reason = match err.webgpu_error_type() {
+        ErrorType::Internal => GPUPipelineErrorReason::Internal,
+        ErrorType::Validation => GPUPipelineErrorReason::Validation,
+        ErrorType::OutOfMemory | ErrorType::DeviceLost => {
+          self.error_handler.push_error(Some(err));
+          return Ok(render_pipeline);
+        }
+      };
+      Err(JsErrorBox::from_err(GPUPipelineError::new(
+        GPUPipelineErrorInit { reason },
+        anyhow::Error::new(err),
+      )))
+      // NOTE: `render_pipeline` gets dropped.
+    } else {
+      Ok(render_pipeline)
+    }
   }
 
   fn create_command_encoder<'a>(
@@ -773,7 +800,8 @@ impl GPUDevice {
   fn new_render_pipeline(
     &self,
     descriptor: super::render_pipeline::GPURenderPipelineDescriptor,
-  ) -> Result<GPURenderPipeline, JsErrorBox> {
+  ) -> Result<(GPURenderPipeline, Option<CreateRenderPipelineError>), JsErrorBox>
+  {
     let vertex = wgpu_core::pipeline::VertexState {
       stage: ProgrammableStageDescriptor {
         module: descriptor.vertex.module.id,
@@ -934,14 +962,14 @@ impl GPUDevice {
       None,
     );
 
-    self.error_handler.push_error(err);
-
-    Ok(GPURenderPipeline {
+    let render_pipeline = GPURenderPipeline {
       instance: self.instance.clone(),
       error_handler: self.error_handler.clone(),
       id,
       label: descriptor.label,
-    })
+    };
+
+    Ok((render_pipeline, err))
   }
 }