dawn/node: Define NAPI_DISABLE_CPP_EXCEPTIONS

Wrap `napi.h` with a Dawn header that defines `NAPI_DISABLE_CPP_EXCEPTIONS`, and then includes the napi.h header.

Required now that CMake correctly disables exceptions with `-fno-exceptions`.

Change-Id: If31b28d331f2071a0119339c60cc3ab8ab801a98
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86301
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/dawn/node/binding/AsyncRunner.h

@@ -19,7 +19,8 @@
 #include <memory>
 
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 
 namespace wgpu::binding {
 

src/dawn/node/binding/Converter.h

@@ -20,8 +20,9 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
 #include "src/dawn/node/binding/Errors.h"
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/Errors.h

@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_NODE_BINDING_ERRORS_H_
 #define SRC_DAWN_NODE_BINDING_ERRORS_H_
 
-#include "node-addon-api/napi.h"
+#include "src/dawn/node/interop/Napi.h"
 
 namespace wgpu::binding {
 

src/dawn/node/binding/GPU.h

@@ -17,8 +17,9 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
 #include "src/dawn/node/binding/Flags.h"
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUAdapter.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUBindGroup.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUBindGroupLayout.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUBuffer.h

@@ -17,8 +17,9 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
 #include "src/dawn/node/binding/AsyncRunner.h"
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUCommandBuffer.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUCommandEncoder.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUComputePassEncoder.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUComputePipeline.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUDevice.h

@@ -16,8 +16,9 @@
 #define SRC_DAWN_NODE_BINDING_GPUDEVICE_H_
 
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
 #include "src/dawn/node/binding/AsyncRunner.h"
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUPipelineLayout.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUQuerySet.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUQueue.h

@@ -17,8 +17,9 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
 #include "src/dawn/node/binding/AsyncRunner.h"
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPURenderBundle.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPURenderBundleEncoder.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPURenderPassEncoder.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPURenderPipeline.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUSampler.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUShaderModule.h

@@ -17,8 +17,9 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
 #include "src/dawn/node/binding/AsyncRunner.h"
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUSupportedLimits.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUTexture.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUTextureView.h

@@ -17,7 +17,8 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "node-addon-api/napi.h"
+
+#include "src/dawn/node/interop/Napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/interop/Core.h

@@ -26,7 +26,7 @@
 #include <variant>
 #include <vector>
 
-#include "node-addon-api/napi.h"
+#include "src/dawn/node/interop/Napi.h"
 
 #include "src/dawn/node/utils/Debug.h"
 
@@ -119,7 +119,7 @@ namespace wgpu::interop {
         // stringified values append to the error message.
         // If Result is a success, then a success Result is returned.
         template <typename... VALUES>
-        Result Append(VALUES && ... values) {
+        Result Append(VALUES&&... values) {
             if (*this) {
                 return *this;
             }

src/dawn/node/interop/Napi.h

@@ -0,0 +1,23 @@
+// Copyright 2022 The Tint Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef SRC_DAWN_NODE_INTEROP_NAPI_H_
+#define SRC_DAWN_NODE_INTEROP_NAPI_H_
+
+// Dawn is built with exceptions disabled.
+#define NAPI_DISABLE_CPP_EXCEPTIONS
+
+#include "node-addon-api/napi.h"
+
+#endif  // SRC_DAWN_NODE_INTEROP_NAPI_H_