From 902ad1f9b21fe0ea9733d74a0cd35ce6ff213a6b Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Fri, 4 Feb 2022 12:51:25 +0000 Subject: [PATCH] tint->dawn: Move src/dawn_node -> src/dawn/node Bug: dawn:1275 Change-Id: I206287da7728788646929e696c756b43d53cf272 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79063 Reviewed-by: Corentin Wallez --- .gitignore | 2 +- CMakeLists.txt | 4 +- src/{dawn_node => dawn/node}/CMakeLists.txt | 0 src/{dawn_node => dawn/node}/Module.cpp | 4 +- src/{dawn_node => dawn/node}/NapiSymbols.cpp | 2 +- src/{dawn_node => dawn/node}/OWNERS | 0 src/{dawn_node => dawn/node}/README.md | 20 +++++----- .../node}/binding/AsyncRunner.cpp | 2 +- .../node}/binding/AsyncRunner.h | 0 .../node}/binding/CMakeLists.txt | 0 .../node}/binding/Converter.cpp | 16 ++++---- .../node}/binding/Converter.h | 4 +- .../node}/binding/Errors.cpp | 2 +- src/{dawn_node => dawn/node}/binding/Errors.h | 0 .../node}/binding/Flags.cpp | 2 +- src/{dawn_node => dawn/node}/binding/Flags.h | 0 src/{dawn_node => dawn/node}/binding/GPU.cpp | 4 +- src/{dawn_node => dawn/node}/binding/GPU.h | 4 +- .../node}/binding/GPUAdapter.cpp | 8 ++-- .../node}/binding/GPUAdapter.h | 2 +- .../node}/binding/GPUBindGroup.cpp | 4 +- .../node}/binding/GPUBindGroup.h | 4 +- .../node}/binding/GPUBindGroupLayout.cpp | 4 +- .../node}/binding/GPUBindGroupLayout.h | 4 +- .../node}/binding/GPUBuffer.cpp | 8 ++-- .../node}/binding/GPUBuffer.h | 6 +-- .../node}/binding/GPUCommandBuffer.cpp | 4 +- .../node}/binding/GPUCommandBuffer.h | 4 +- .../node}/binding/GPUCommandEncoder.cpp | 20 +++++----- .../node}/binding/GPUCommandEncoder.h | 2 +- .../node}/binding/GPUComputePassEncoder.cpp | 14 +++---- .../node}/binding/GPUComputePassEncoder.h | 4 +- .../node}/binding/GPUComputePipeline.cpp | 8 ++-- .../node}/binding/GPUComputePipeline.h | 4 +- .../node}/binding/GPUDevice.cpp | 38 +++++++++---------- .../node}/binding/GPUDevice.h | 4 +- .../node}/binding/GPUPipelineLayout.cpp | 4 +- .../node}/binding/GPUPipelineLayout.h | 4 +- .../node}/binding/GPUQuerySet.cpp | 4 +- .../node}/binding/GPUQuerySet.h | 4 +- .../node}/binding/GPUQueue.cpp | 10 ++--- .../node}/binding/GPUQueue.h | 4 +- .../node}/binding/GPURenderBundle.cpp | 12 +++--- .../node}/binding/GPURenderBundle.h | 4 +- .../node}/binding/GPURenderBundleEncoder.cpp | 14 +++---- .../node}/binding/GPURenderBundleEncoder.h | 2 +- .../node}/binding/GPURenderPassEncoder.cpp | 16 ++++---- .../node}/binding/GPURenderPassEncoder.h | 4 +- .../node}/binding/GPURenderPipeline.cpp | 8 ++-- .../node}/binding/GPURenderPipeline.h | 4 +- .../node}/binding/GPUSampler.cpp | 6 +-- .../node}/binding/GPUSampler.h | 4 +- .../node}/binding/GPUShaderModule.cpp | 4 +- .../node}/binding/GPUShaderModule.h | 6 +-- .../node}/binding/GPUSupportedLimits.cpp | 2 +- .../node}/binding/GPUSupportedLimits.h | 2 +- .../node}/binding/GPUTexture.cpp | 10 ++--- .../node}/binding/GPUTexture.h | 4 +- .../node}/binding/GPUTextureView.cpp | 4 +- .../node}/binding/GPUTextureView.h | 4 +- .../node}/interop/Browser.idl | 0 .../node}/interop/CMakeLists.txt | 2 +- src/{dawn_node => dawn/node}/interop/Core.cpp | 2 +- src/{dawn_node => dawn/node}/interop/Core.h | 6 +-- .../node}/interop/WebGPU.cpp.tmpl | 8 ++-- .../node}/interop/WebGPU.h.tmpl | 6 +-- .../node}/interop/WebGPUCommon.tmpl | 4 +- src/{dawn_node => dawn/node}/tools/go.mod | 2 +- src/{dawn_node => dawn/node}/tools/go.sum | 0 src/{dawn_node => dawn/node}/tools/run-cts | 0 .../node}/tools/src/cmd/idlgen/main.go | 0 .../node}/tools/src/cmd/run-cts/main.go | 0 src/{dawn_node => dawn/node}/utils/Debug.h | 0 73 files changed, 189 insertions(+), 189 deletions(-) rename src/{dawn_node => dawn/node}/CMakeLists.txt (100%) rename src/{dawn_node => dawn/node}/Module.cpp (96%) rename src/{dawn_node => dawn/node}/NapiSymbols.cpp (97%) rename src/{dawn_node => dawn/node}/OWNERS (100%) rename src/{dawn_node => dawn/node}/README.md (87%) rename src/{dawn_node => dawn/node}/binding/AsyncRunner.cpp (97%) rename src/{dawn_node => dawn/node}/binding/AsyncRunner.h (100%) rename src/{dawn_node => dawn/node}/binding/CMakeLists.txt (100%) rename src/{dawn_node => dawn/node}/binding/Converter.cpp (99%) rename src/{dawn_node => dawn/node}/binding/Converter.h (99%) rename src/{dawn_node => dawn/node}/binding/Errors.cpp (99%) rename src/{dawn_node => dawn/node}/binding/Errors.h (100%) rename src/{dawn_node => dawn/node}/binding/Flags.cpp (95%) rename src/{dawn_node => dawn/node}/binding/Flags.h (100%) rename src/{dawn_node => dawn/node}/binding/GPU.cpp (98%) rename src/{dawn_node => dawn/node}/binding/GPU.h (94%) rename src/{dawn_node => dawn/node}/binding/GPUAdapter.cpp (98%) rename src/{dawn_node => dawn/node}/binding/GPUAdapter.h (97%) rename src/{dawn_node => dawn/node}/binding/GPUBindGroup.cpp (93%) rename src/{dawn_node => dawn/node}/binding/GPUBindGroup.h (93%) rename src/{dawn_node => dawn/node}/binding/GPUBindGroupLayout.cpp (92%) rename src/{dawn_node => dawn/node}/binding/GPUBindGroupLayout.h (93%) rename src/{dawn_node => dawn/node}/binding/GPUBuffer.cpp (97%) rename src/{dawn_node => dawn/node}/binding/GPUBuffer.h (95%) rename src/{dawn_node => dawn/node}/binding/GPUCommandBuffer.cpp (92%) rename src/{dawn_node => dawn/node}/binding/GPUCommandBuffer.h (93%) rename src/{dawn_node => dawn/node}/binding/GPUCommandEncoder.cpp (94%) rename src/{dawn_node => dawn/node}/binding/GPUCommandEncoder.h (98%) rename src/{dawn_node => dawn/node}/binding/GPUComputePassEncoder.cpp (91%) rename src/{dawn_node => dawn/node}/binding/GPUComputePassEncoder.h (96%) rename src/{dawn_node => dawn/node}/binding/GPUComputePipeline.cpp (88%) rename src/{dawn_node => dawn/node}/binding/GPUComputePipeline.h (94%) rename src/{dawn_node => dawn/node}/binding/GPUDevice.cpp (95%) rename src/{dawn_node => dawn/node}/binding/GPUDevice.h (98%) rename src/{dawn_node => dawn/node}/binding/GPUPipelineLayout.cpp (92%) rename src/{dawn_node => dawn/node}/binding/GPUPipelineLayout.h (93%) rename src/{dawn_node => dawn/node}/binding/GPUQuerySet.cpp (93%) rename src/{dawn_node => dawn/node}/binding/GPUQuerySet.h (93%) rename src/{dawn_node => dawn/node}/binding/GPUQueue.cpp (95%) rename src/{dawn_node => dawn/node}/binding/GPUQueue.h (96%) rename src/{dawn_node => dawn/node}/binding/GPURenderBundle.cpp (80%) rename src/{dawn_node => dawn/node}/binding/GPURenderBundle.h (93%) rename src/{dawn_node => dawn/node}/binding/GPURenderBundleEncoder.cpp (95%) rename src/{dawn_node => dawn/node}/binding/GPURenderBundleEncoder.h (99%) rename src/{dawn_node => dawn/node}/binding/GPURenderPassEncoder.cpp (95%) rename src/{dawn_node => dawn/node}/binding/GPURenderPassEncoder.h (97%) rename src/{dawn_node => dawn/node}/binding/GPURenderPipeline.cpp (88%) rename src/{dawn_node => dawn/node}/binding/GPURenderPipeline.h (94%) rename src/{dawn_node => dawn/node}/binding/GPUSampler.cpp (89%) rename src/{dawn_node => dawn/node}/binding/GPUSampler.h (93%) rename src/{dawn_node => dawn/node}/binding/GPUShaderModule.cpp (98%) rename src/{dawn_node => dawn/node}/binding/GPUShaderModule.h (91%) rename src/{dawn_node => dawn/node}/binding/GPUSupportedLimits.cpp (98%) rename src/{dawn_node => dawn/node}/binding/GPUSupportedLimits.h (98%) rename src/{dawn_node => dawn/node}/binding/GPUTexture.cpp (90%) rename src/{dawn_node => dawn/node}/binding/GPUTexture.h (94%) rename src/{dawn_node => dawn/node}/binding/GPUTextureView.cpp (92%) rename src/{dawn_node => dawn/node}/binding/GPUTextureView.h (93%) rename src/{dawn_node => dawn/node}/interop/Browser.idl (100%) rename src/{dawn_node => dawn/node}/interop/CMakeLists.txt (96%) rename src/{dawn_node => dawn/node}/interop/Core.cpp (99%) rename src/{dawn_node => dawn/node}/interop/Core.h (99%) rename src/{dawn_node => dawn/node}/interop/WebGPU.cpp.tmpl (98%) rename src/{dawn_node => dawn/node}/interop/WebGPU.h.tmpl (98%) rename src/{dawn_node => dawn/node}/interop/WebGPUCommon.tmpl (97%) rename src/{dawn_node => dawn/node}/tools/go.mod (76%) rename src/{dawn_node => dawn/node}/tools/go.sum (100%) rename src/{dawn_node => dawn/node}/tools/run-cts (100%) rename src/{dawn_node => dawn/node}/tools/src/cmd/idlgen/main.go (100%) rename src/{dawn_node => dawn/node}/tools/src/cmd/run-cts/main.go (100%) rename src/{dawn_node => dawn/node}/utils/Debug.h (100%) diff --git a/.gitignore b/.gitignore index 3453fb61ed..752f3ca596 100644 --- a/.gitignore +++ b/.gitignore @@ -97,4 +97,4 @@ Desktop.ini $RECYCLE.BIN/ ### Dawn node tools binaries -src/dawn_node/tools/bin/ +src/dawn/node/tools/bin/ diff --git a/CMakeLists.txt b/CMakeLists.txt index d561428f6d..024cf45be0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,7 +237,7 @@ if (DAWN_BUILD_NODE_BINDINGS) message(FATAL_ERROR "DAWN_BUILD_NODE_BINDINGS requires missing dependency '${DEP}'\n" "Please follow the 'Fetch dependencies' instructions at:\n" - "./src/dawn_node/README.md" + "./src/dawn/node/README.md" ) endif() endforeach() @@ -245,5 +245,5 @@ if (DAWN_BUILD_NODE_BINDINGS) message(FATAL_ERROR "DAWN_BUILD_NODE_BINDINGS requires building with DAWN_ENABLE_PIC") endif() - add_subdirectory(src/dawn_node) + add_subdirectory(src/dawn/node) endif() diff --git a/src/dawn_node/CMakeLists.txt b/src/dawn/node/CMakeLists.txt similarity index 100% rename from src/dawn_node/CMakeLists.txt rename to src/dawn/node/CMakeLists.txt diff --git a/src/dawn_node/Module.cpp b/src/dawn/node/Module.cpp similarity index 96% rename from src/dawn_node/Module.cpp rename to src/dawn/node/Module.cpp index 4f07c4dd8c..f87631b0e5 100644 --- a/src/dawn_node/Module.cpp +++ b/src/dawn/node/Module.cpp @@ -13,8 +13,8 @@ // limitations under the License. #include "dawn/dawn_proc.h" -#include "src/dawn_node/binding/Flags.h" -#include "src/dawn_node/binding/GPU.h" +#include "src/dawn/node/binding/Flags.h" +#include "src/dawn/node/binding/GPU.h" namespace { Napi::Value CreateGPU(const Napi::CallbackInfo& info) { diff --git a/src/dawn_node/NapiSymbols.cpp b/src/dawn/node/NapiSymbols.cpp similarity index 97% rename from src/dawn_node/NapiSymbols.cpp rename to src/dawn/node/NapiSymbols.cpp index 3c4aac1e2e..a557eca4d5 100644 --- a/src/dawn_node/NapiSymbols.cpp +++ b/src/dawn/node/NapiSymbols.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" // To reduce the build dependencies for compiling the dawn.node targets, we do // not use cmake-js for building, but instead just depend on node_api_headers. diff --git a/src/dawn_node/OWNERS b/src/dawn/node/OWNERS similarity index 100% rename from src/dawn_node/OWNERS rename to src/dawn/node/OWNERS diff --git a/src/dawn_node/README.md b/src/dawn/node/README.md similarity index 87% rename from src/dawn_node/README.md rename to src/dawn/node/README.md index d9b1f68ba3..1306d243d5 100644 --- a/src/dawn_node/README.md +++ b/src/dawn/node/README.md @@ -57,15 +57,15 @@ ninja dawn.node - Run `npm install` from inside the CTS directory to install its dependencies ```sh -./src/dawn_node/tools/run-cts --cts= --dawn-node= [WebGPU CTS query] +./src/dawn/node/tools/run-cts --cts= --dawn-node= [WebGPU CTS query] ``` If this fails with the error message `TypeError: expander is not a function or its return value is not iterable`, try appending `--build=false` to the start of the `run-cts` command line flags. -To test against SwiftShader instead of the default Vulkan device, prefix `./src/dawn_node/tools/run-cts` with `VK_ICD_FILENAMES=/Linux/vk_swiftshader_icd.json` and append `--flag=dawn-backend=vulkan` to the start of run-cts command line flags. For example: +To test against SwiftShader instead of the default Vulkan device, prefix `./src/dawn/node/tools/run-cts` with `VK_ICD_FILENAMES=/Linux/vk_swiftshader_icd.json` and append `--flag=dawn-backend=vulkan` to the start of run-cts command line flags. For example: ```sh -VK_ICD_FILENAMES=/Linux/vk_swiftshader_icd.json ./src/dawn_node/tools/run-cts --cts= --dawn-node= --flag=dawn-backend=vulkan [WebGPU CTS query] +VK_ICD_FILENAMES=/Linux/vk_swiftshader_icd.json ./src/dawn/node/tools/run-cts --cts= --dawn-node= --flag=dawn-backend=vulkan [WebGPU CTS query] ``` The `--flag` parameter must be passed in multiple times, once for each flag begin set. Here are some common arguments: @@ -77,7 +77,7 @@ The `--flag` parameter must be passed in multiple times, once for each flag begi For example, on Windows, to use the d3dcompiler_47.dll from a Chromium checkout, and to dump shader output, we could run the following using Git Bash: ```sh -./src/dawn_node/tools/run-cts --verbose --dawn-node=/c/src/dawn/build/Debug/dawn.node --cts=/c/src/gpuweb-cts --flag=dlldir="C:\src\chromium\src\out\Release" --flag=enable-dawn-features=dump_shaders 'webgpu:shader,execution,builtin,abs:integer_builtin_functions,abs_unsigned:storageClass="storage";storageMode="read_write";containerType="vector";isAtomic=false;baseType="u32";type="vec2%3Cu32%3E"' +./src/dawn/node/tools/run-cts --verbose --dawn-node=/c/src/dawn/build/Debug/dawn.node --cts=/c/src/gpuweb-cts --flag=dlldir="C:\src\chromium\src\out\Release" --flag=enable-dawn-features=dump_shaders 'webgpu:shader,execution,builtin,abs:integer_builtin_functions,abs_unsigned:storageClass="storage";storageMode="read_write";containerType="vector";isAtomic=false;baseType="u32";type="vec2%3Cu32%3E"' ``` Note that we pass `--verbose` above so that all test output, including the dumped shader, is written to stdout. @@ -122,14 +122,14 @@ Replacing: ## Known issues - Many WebGPU CTS tests are currently known to fail -- Dawn uses special token values for some parameters / fields. These are currently passed straight through to dawn from the JavaScript. discussions: [1](https://dawn-review.googlesource.com/c/dawn/+/64907/5/src/dawn_node/binding/Converter.cpp#167), [2](https://dawn-review.googlesource.com/c/dawn/+/64907/5/src/dawn_node/binding/Converter.cpp#928), [3](https://dawn-review.googlesource.com/c/dawn/+/64909/4/src/dawn_node/binding/GPUTexture.cpp#42) -- Backend validation is currently always set to 'full' to aid in debugging. This can be extremely slow. [discussion](https://dawn-review.googlesource.com/c/dawn/+/64916/4/src/dawn_node/binding/GPU.cpp#25) -- Attempting to call `new T` in JavaScript, where `T` is an IDL interface type, should result in a TypeError "Illegal constructor". [discussion](https://dawn-review.googlesource.com/c/dawn/+/64902/9/src/dawn_node/interop/WebGPU.cpp.tmpl#293) -- `GPUDevice` currently maintains a list of "lost promises". This should return the same promise. [discussion](https://dawn-review.googlesource.com/c/dawn/+/64906/6/src/dawn_node/binding/GPUDevice.h#107) +- Dawn uses special token values for some parameters / fields. These are currently passed straight through to dawn from the JavaScript. discussions: [1](https://dawn-review.googlesource.com/c/dawn/+/64907/5/src/dawn/node/binding/Converter.cpp#167), [2](https://dawn-review.googlesource.com/c/dawn/+/64907/5/src/dawn/node/binding/Converter.cpp#928), [3](https://dawn-review.googlesource.com/c/dawn/+/64909/4/src/dawn/node/binding/GPUTexture.cpp#42) +- Backend validation is currently always set to 'full' to aid in debugging. This can be extremely slow. [discussion](https://dawn-review.googlesource.com/c/dawn/+/64916/4/src/dawn/node/binding/GPU.cpp#25) +- Attempting to call `new T` in JavaScript, where `T` is an IDL interface type, should result in a TypeError "Illegal constructor". [discussion](https://dawn-review.googlesource.com/c/dawn/+/64902/9/src/dawn/node/interop/WebGPU.cpp.tmpl#293) +- `GPUDevice` currently maintains a list of "lost promises". This should return the same promise. [discussion](https://dawn-review.googlesource.com/c/dawn/+/64906/6/src/dawn/node/binding/GPUDevice.h#107) ## Remaining work - Investigate CTS failures that are not expected to fail. -- Generated includes live in `src/` for `dawn_node`, but outside for Dawn. [discussion](https://dawn-review.googlesource.com/c/dawn/+/64903/9/src/dawn_node/interop/CMakeLists.txt#56) +- Generated includes live in `src/` for `dawn/node`, but outside for Dawn. [discussion](https://dawn-review.googlesource.com/c/dawn/+/64903/9/src/dawn/node/interop/CMakeLists.txt#56) - Hook up to presubmit bots (CQ / Kokoro) -- `binding::GPU` will require significant rework [once Dawn implements the device / adapter creation path properly](https://dawn-review.googlesource.com/c/dawn/+/64916/4/src/dawn_node/binding/GPU.cpp). +- `binding::GPU` will require significant rework [once Dawn implements the device / adapter creation path properly](https://dawn-review.googlesource.com/c/dawn/+/64916/4/src/dawn/node/binding/GPU.cpp). diff --git a/src/dawn_node/binding/AsyncRunner.cpp b/src/dawn/node/binding/AsyncRunner.cpp similarity index 97% rename from src/dawn_node/binding/AsyncRunner.cpp rename to src/dawn/node/binding/AsyncRunner.cpp index 94382d15a3..a978fa8e3b 100644 --- a/src/dawn_node/binding/AsyncRunner.cpp +++ b/src/dawn/node/binding/AsyncRunner.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/AsyncRunner.h" +#include "src/dawn/node/binding/AsyncRunner.h" #include #include diff --git a/src/dawn_node/binding/AsyncRunner.h b/src/dawn/node/binding/AsyncRunner.h similarity index 100% rename from src/dawn_node/binding/AsyncRunner.h rename to src/dawn/node/binding/AsyncRunner.h diff --git a/src/dawn_node/binding/CMakeLists.txt b/src/dawn/node/binding/CMakeLists.txt similarity index 100% rename from src/dawn_node/binding/CMakeLists.txt rename to src/dawn/node/binding/CMakeLists.txt diff --git a/src/dawn_node/binding/Converter.cpp b/src/dawn/node/binding/Converter.cpp similarity index 99% rename from src/dawn_node/binding/Converter.cpp rename to src/dawn/node/binding/Converter.cpp index a0fc7e44ff..7387ce120b 100644 --- a/src/dawn_node/binding/Converter.cpp +++ b/src/dawn/node/binding/Converter.cpp @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/Converter.h" +#include "src/dawn/node/binding/Converter.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/binding/GPUPipelineLayout.h" -#include "src/dawn_node/binding/GPUSampler.h" -#include "src/dawn_node/binding/GPUShaderModule.h" -#include "src/dawn_node/binding/GPUTexture.h" -#include "src/dawn_node/binding/GPUTextureView.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/binding/GPUPipelineLayout.h" +#include "src/dawn/node/binding/GPUSampler.h" +#include "src/dawn/node/binding/GPUShaderModule.h" +#include "src/dawn/node/binding/GPUTexture.h" +#include "src/dawn/node/binding/GPUTextureView.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/Converter.h b/src/dawn/node/binding/Converter.h similarity index 99% rename from src/dawn_node/binding/Converter.h rename to src/dawn/node/binding/Converter.h index 3af900ad7a..29953df826 100644 --- a/src/dawn_node/binding/Converter.h +++ b/src/dawn/node/binding/Converter.h @@ -21,8 +21,8 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/binding/Errors.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/binding/Errors.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/Errors.cpp b/src/dawn/node/binding/Errors.cpp similarity index 99% rename from src/dawn_node/binding/Errors.cpp rename to src/dawn/node/binding/Errors.cpp index 722be27a47..36cf2032be 100644 --- a/src/dawn_node/binding/Errors.cpp +++ b/src/dawn/node/binding/Errors.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/Errors.h" +#include "src/dawn/node/binding/Errors.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/Errors.h b/src/dawn/node/binding/Errors.h similarity index 100% rename from src/dawn_node/binding/Errors.h rename to src/dawn/node/binding/Errors.h diff --git a/src/dawn_node/binding/Flags.cpp b/src/dawn/node/binding/Flags.cpp similarity index 95% rename from src/dawn_node/binding/Flags.cpp rename to src/dawn/node/binding/Flags.cpp index 9985a49e04..40b0560eee 100644 --- a/src/dawn_node/binding/Flags.cpp +++ b/src/dawn/node/binding/Flags.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/Flags.h" +#include "src/dawn/node/binding/Flags.h" namespace wgpu::binding { void Flags::Set(const std::string& key, const std::string& value) { diff --git a/src/dawn_node/binding/Flags.h b/src/dawn/node/binding/Flags.h similarity index 100% rename from src/dawn_node/binding/Flags.h rename to src/dawn/node/binding/Flags.h diff --git a/src/dawn_node/binding/GPU.cpp b/src/dawn/node/binding/GPU.cpp similarity index 98% rename from src/dawn_node/binding/GPU.cpp rename to src/dawn/node/binding/GPU.cpp index 4e18a9170e..43472ec546 100644 --- a/src/dawn_node/binding/GPU.cpp +++ b/src/dawn/node/binding/GPU.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPU.h" +#include "src/dawn/node/binding/GPU.h" -#include "src/dawn_node/binding/GPUAdapter.h" +#include "src/dawn/node/binding/GPUAdapter.h" #include diff --git a/src/dawn_node/binding/GPU.h b/src/dawn/node/binding/GPU.h similarity index 94% rename from src/dawn_node/binding/GPU.h rename to src/dawn/node/binding/GPU.h index c840b9508b..f33a0c47ba 100644 --- a/src/dawn_node/binding/GPU.h +++ b/src/dawn/node/binding/GPU.h @@ -18,8 +18,8 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/binding/Flags.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/binding/Flags.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { // GPU is an implementation of interop::GPU that wraps a dawn::native::Instance. diff --git a/src/dawn_node/binding/GPUAdapter.cpp b/src/dawn/node/binding/GPUAdapter.cpp similarity index 98% rename from src/dawn_node/binding/GPUAdapter.cpp rename to src/dawn/node/binding/GPUAdapter.cpp index e91fb895ce..b8e97db4e6 100644 --- a/src/dawn_node/binding/GPUAdapter.cpp +++ b/src/dawn/node/binding/GPUAdapter.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUAdapter.h" +#include "src/dawn/node/binding/GPUAdapter.h" #include -#include "src/dawn_node/binding/Flags.h" -#include "src/dawn_node/binding/GPUDevice.h" -#include "src/dawn_node/binding/GPUSupportedLimits.h" +#include "src/dawn/node/binding/Flags.h" +#include "src/dawn/node/binding/GPUDevice.h" +#include "src/dawn/node/binding/GPUSupportedLimits.h" namespace { // TODO(amaiorano): Move to utility header diff --git a/src/dawn_node/binding/GPUAdapter.h b/src/dawn/node/binding/GPUAdapter.h similarity index 97% rename from src/dawn_node/binding/GPUAdapter.h rename to src/dawn/node/binding/GPUAdapter.h index 3bcd7d3420..1498c16906 100644 --- a/src/dawn_node/binding/GPUAdapter.h +++ b/src/dawn/node/binding/GPUAdapter.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { class Flags; diff --git a/src/dawn_node/binding/GPUBindGroup.cpp b/src/dawn/node/binding/GPUBindGroup.cpp similarity index 93% rename from src/dawn_node/binding/GPUBindGroup.cpp rename to src/dawn/node/binding/GPUBindGroup.cpp index 3e7b2a1fcd..36b092966a 100644 --- a/src/dawn_node/binding/GPUBindGroup.cpp +++ b/src/dawn/node/binding/GPUBindGroup.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUBindGroup.h" +#include "src/dawn/node/binding/GPUBindGroup.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUBindGroup.h b/src/dawn/node/binding/GPUBindGroup.h similarity index 93% rename from src/dawn_node/binding/GPUBindGroup.h rename to src/dawn/node/binding/GPUBindGroup.h index 342cf0d88c..10fc9fe1c8 100644 --- a/src/dawn_node/binding/GPUBindGroup.h +++ b/src/dawn/node/binding/GPUBindGroup.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -28,7 +28,7 @@ namespace wgpu::binding { GPUBindGroup(wgpu::BindGroup group); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::BindGroup &() const { + inline operator const wgpu::BindGroup&() const { return group_; } diff --git a/src/dawn_node/binding/GPUBindGroupLayout.cpp b/src/dawn/node/binding/GPUBindGroupLayout.cpp similarity index 92% rename from src/dawn_node/binding/GPUBindGroupLayout.cpp rename to src/dawn/node/binding/GPUBindGroupLayout.cpp index db32a57dae..6b1a5abcf5 100644 --- a/src/dawn_node/binding/GPUBindGroupLayout.cpp +++ b/src/dawn/node/binding/GPUBindGroupLayout.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUBindGroupLayout.h" +#include "src/dawn/node/binding/GPUBindGroupLayout.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUBindGroupLayout.h b/src/dawn/node/binding/GPUBindGroupLayout.h similarity index 93% rename from src/dawn_node/binding/GPUBindGroupLayout.h rename to src/dawn/node/binding/GPUBindGroupLayout.h index 92d476d787..45373b4d4c 100644 --- a/src/dawn_node/binding/GPUBindGroupLayout.h +++ b/src/dawn/node/binding/GPUBindGroupLayout.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -29,7 +29,7 @@ namespace wgpu::binding { GPUBindGroupLayout(wgpu::BindGroupLayout layout); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::BindGroupLayout &() const { + inline operator const wgpu::BindGroupLayout&() const { return layout_; } diff --git a/src/dawn_node/binding/GPUBuffer.cpp b/src/dawn/node/binding/GPUBuffer.cpp similarity index 97% rename from src/dawn_node/binding/GPUBuffer.cpp rename to src/dawn/node/binding/GPUBuffer.cpp index 652c2e76ec..5f84bc100b 100644 --- a/src/dawn_node/binding/GPUBuffer.cpp +++ b/src/dawn/node/binding/GPUBuffer.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUBuffer.h" +#include "src/dawn/node/binding/GPUBuffer.h" #include -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/binding/Errors.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/binding/Errors.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUBuffer.h b/src/dawn/node/binding/GPUBuffer.h similarity index 95% rename from src/dawn_node/binding/GPUBuffer.h rename to src/dawn/node/binding/GPUBuffer.h index 7bc1d7e515..35e1577bbe 100644 --- a/src/dawn_node/binding/GPUBuffer.h +++ b/src/dawn/node/binding/GPUBuffer.h @@ -18,8 +18,8 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/binding/AsyncRunner.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/binding/AsyncRunner.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -37,7 +37,7 @@ namespace wgpu::binding { } // Implicit cast operator to Dawn GPU object - inline operator const wgpu::Buffer &() const { + inline operator const wgpu::Buffer&() const { return buffer_; } diff --git a/src/dawn_node/binding/GPUCommandBuffer.cpp b/src/dawn/node/binding/GPUCommandBuffer.cpp similarity index 92% rename from src/dawn_node/binding/GPUCommandBuffer.cpp rename to src/dawn/node/binding/GPUCommandBuffer.cpp index 9521871065..ab0f7083a1 100644 --- a/src/dawn_node/binding/GPUCommandBuffer.cpp +++ b/src/dawn/node/binding/GPUCommandBuffer.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUCommandBuffer.h" +#include "src/dawn/node/binding/GPUCommandBuffer.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUCommandBuffer.h b/src/dawn/node/binding/GPUCommandBuffer.h similarity index 93% rename from src/dawn_node/binding/GPUCommandBuffer.h rename to src/dawn/node/binding/GPUCommandBuffer.h index 89a6056c4c..43bd2f83bb 100644 --- a/src/dawn_node/binding/GPUCommandBuffer.h +++ b/src/dawn/node/binding/GPUCommandBuffer.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -29,7 +29,7 @@ namespace wgpu::binding { GPUCommandBuffer(wgpu::CommandBuffer cmd_buf); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::CommandBuffer &() const { + inline operator const wgpu::CommandBuffer&() const { return cmd_buf_; } diff --git a/src/dawn_node/binding/GPUCommandEncoder.cpp b/src/dawn/node/binding/GPUCommandEncoder.cpp similarity index 94% rename from src/dawn_node/binding/GPUCommandEncoder.cpp rename to src/dawn/node/binding/GPUCommandEncoder.cpp index b475de4e92..b6beee6577 100644 --- a/src/dawn_node/binding/GPUCommandEncoder.cpp +++ b/src/dawn/node/binding/GPUCommandEncoder.cpp @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUCommandEncoder.h" +#include "src/dawn/node/binding/GPUCommandEncoder.h" -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/binding/GPU.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/binding/GPUCommandBuffer.h" -#include "src/dawn_node/binding/GPUComputePassEncoder.h" -#include "src/dawn_node/binding/GPUQuerySet.h" -#include "src/dawn_node/binding/GPURenderPassEncoder.h" -#include "src/dawn_node/binding/GPUTexture.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/binding/GPU.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/binding/GPUCommandBuffer.h" +#include "src/dawn/node/binding/GPUComputePassEncoder.h" +#include "src/dawn/node/binding/GPUQuerySet.h" +#include "src/dawn/node/binding/GPURenderPassEncoder.h" +#include "src/dawn/node/binding/GPUTexture.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUCommandEncoder.h b/src/dawn/node/binding/GPUCommandEncoder.h similarity index 98% rename from src/dawn_node/binding/GPUCommandEncoder.h rename to src/dawn/node/binding/GPUCommandEncoder.h index ed6152639d..b192f7bf06 100644 --- a/src/dawn_node/binding/GPUCommandEncoder.h +++ b/src/dawn/node/binding/GPUCommandEncoder.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUComputePassEncoder.cpp b/src/dawn/node/binding/GPUComputePassEncoder.cpp similarity index 91% rename from src/dawn_node/binding/GPUComputePassEncoder.cpp rename to src/dawn/node/binding/GPUComputePassEncoder.cpp index 03145eed9f..4bc3a5ce7b 100644 --- a/src/dawn_node/binding/GPUComputePassEncoder.cpp +++ b/src/dawn/node/binding/GPUComputePassEncoder.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUComputePassEncoder.h" +#include "src/dawn/node/binding/GPUComputePassEncoder.h" -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/binding/GPUBindGroup.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/binding/GPUComputePipeline.h" -#include "src/dawn_node/binding/GPUQuerySet.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/binding/GPUBindGroup.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/binding/GPUComputePipeline.h" +#include "src/dawn/node/binding/GPUQuerySet.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUComputePassEncoder.h b/src/dawn/node/binding/GPUComputePassEncoder.h similarity index 96% rename from src/dawn_node/binding/GPUComputePassEncoder.h rename to src/dawn/node/binding/GPUComputePassEncoder.h index f82280bb4e..fc715330b7 100644 --- a/src/dawn_node/binding/GPUComputePassEncoder.h +++ b/src/dawn/node/binding/GPUComputePassEncoder.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -29,7 +29,7 @@ namespace wgpu::binding { GPUComputePassEncoder(wgpu::ComputePassEncoder enc); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::ComputePassEncoder &() const { + inline operator const wgpu::ComputePassEncoder&() const { return enc_; } diff --git a/src/dawn_node/binding/GPUComputePipeline.cpp b/src/dawn/node/binding/GPUComputePipeline.cpp similarity index 88% rename from src/dawn_node/binding/GPUComputePipeline.cpp rename to src/dawn/node/binding/GPUComputePipeline.cpp index be6d1c39e5..9e57961d26 100644 --- a/src/dawn_node/binding/GPUComputePipeline.cpp +++ b/src/dawn/node/binding/GPUComputePipeline.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUComputePipeline.h" +#include "src/dawn/node/binding/GPUComputePipeline.h" -#include "src/dawn_node/binding/GPUBindGroupLayout.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/GPUBindGroupLayout.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUComputePipeline.h b/src/dawn/node/binding/GPUComputePipeline.h similarity index 94% rename from src/dawn_node/binding/GPUComputePipeline.h rename to src/dawn/node/binding/GPUComputePipeline.h index a4b8bcae93..0b763dd836 100644 --- a/src/dawn_node/binding/GPUComputePipeline.h +++ b/src/dawn/node/binding/GPUComputePipeline.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -29,7 +29,7 @@ namespace wgpu::binding { GPUComputePipeline(wgpu::ComputePipeline pipeline); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::ComputePipeline &() const { + inline operator const wgpu::ComputePipeline&() const { return pipeline_; } diff --git a/src/dawn_node/binding/GPUDevice.cpp b/src/dawn/node/binding/GPUDevice.cpp similarity index 95% rename from src/dawn_node/binding/GPUDevice.cpp rename to src/dawn/node/binding/GPUDevice.cpp index 2d09df7db9..2358b700f0 100644 --- a/src/dawn_node/binding/GPUDevice.cpp +++ b/src/dawn/node/binding/GPUDevice.cpp @@ -12,28 +12,28 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUDevice.h" +#include "src/dawn/node/binding/GPUDevice.h" #include -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/binding/Errors.h" -#include "src/dawn_node/binding/GPUBindGroup.h" -#include "src/dawn_node/binding/GPUBindGroupLayout.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/binding/GPUCommandBuffer.h" -#include "src/dawn_node/binding/GPUCommandEncoder.h" -#include "src/dawn_node/binding/GPUComputePipeline.h" -#include "src/dawn_node/binding/GPUPipelineLayout.h" -#include "src/dawn_node/binding/GPUQuerySet.h" -#include "src/dawn_node/binding/GPUQueue.h" -#include "src/dawn_node/binding/GPURenderBundleEncoder.h" -#include "src/dawn_node/binding/GPURenderPipeline.h" -#include "src/dawn_node/binding/GPUSampler.h" -#include "src/dawn_node/binding/GPUShaderModule.h" -#include "src/dawn_node/binding/GPUSupportedLimits.h" -#include "src/dawn_node/binding/GPUTexture.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/binding/Errors.h" +#include "src/dawn/node/binding/GPUBindGroup.h" +#include "src/dawn/node/binding/GPUBindGroupLayout.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/binding/GPUCommandBuffer.h" +#include "src/dawn/node/binding/GPUCommandEncoder.h" +#include "src/dawn/node/binding/GPUComputePipeline.h" +#include "src/dawn/node/binding/GPUPipelineLayout.h" +#include "src/dawn/node/binding/GPUQuerySet.h" +#include "src/dawn/node/binding/GPUQueue.h" +#include "src/dawn/node/binding/GPURenderBundleEncoder.h" +#include "src/dawn/node/binding/GPURenderPipeline.h" +#include "src/dawn/node/binding/GPUSampler.h" +#include "src/dawn/node/binding/GPUShaderModule.h" +#include "src/dawn/node/binding/GPUSupportedLimits.h" +#include "src/dawn/node/binding/GPUTexture.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUDevice.h b/src/dawn/node/binding/GPUDevice.h similarity index 98% rename from src/dawn_node/binding/GPUDevice.h rename to src/dawn/node/binding/GPUDevice.h index 368f86b723..84ba67d027 100644 --- a/src/dawn_node/binding/GPUDevice.h +++ b/src/dawn/node/binding/GPUDevice.h @@ -17,8 +17,8 @@ #include "dawn/webgpu_cpp.h" #include "napi.h" -#include "src/dawn_node/binding/AsyncRunner.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/binding/AsyncRunner.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { // GPUDevice is an implementation of interop::GPUDevice that wraps a wgpu::Device. diff --git a/src/dawn_node/binding/GPUPipelineLayout.cpp b/src/dawn/node/binding/GPUPipelineLayout.cpp similarity index 92% rename from src/dawn_node/binding/GPUPipelineLayout.cpp rename to src/dawn/node/binding/GPUPipelineLayout.cpp index 712e3fee99..945fb4a876 100644 --- a/src/dawn_node/binding/GPUPipelineLayout.cpp +++ b/src/dawn/node/binding/GPUPipelineLayout.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUPipelineLayout.h" +#include "src/dawn/node/binding/GPUPipelineLayout.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUPipelineLayout.h b/src/dawn/node/binding/GPUPipelineLayout.h similarity index 93% rename from src/dawn_node/binding/GPUPipelineLayout.h rename to src/dawn/node/binding/GPUPipelineLayout.h index 02f07c1448..fab2215c1b 100644 --- a/src/dawn_node/binding/GPUPipelineLayout.h +++ b/src/dawn/node/binding/GPUPipelineLayout.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -29,7 +29,7 @@ namespace wgpu::binding { GPUPipelineLayout(wgpu::PipelineLayout layout); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::PipelineLayout &() const { + inline operator const wgpu::PipelineLayout&() const { return layout_; } diff --git a/src/dawn_node/binding/GPUQuerySet.cpp b/src/dawn/node/binding/GPUQuerySet.cpp similarity index 93% rename from src/dawn_node/binding/GPUQuerySet.cpp rename to src/dawn/node/binding/GPUQuerySet.cpp index 836faf91ec..b0714f4849 100644 --- a/src/dawn_node/binding/GPUQuerySet.cpp +++ b/src/dawn/node/binding/GPUQuerySet.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUQuerySet.h" +#include "src/dawn/node/binding/GPUQuerySet.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUQuerySet.h b/src/dawn/node/binding/GPUQuerySet.h similarity index 93% rename from src/dawn_node/binding/GPUQuerySet.h rename to src/dawn/node/binding/GPUQuerySet.h index 46d8097bb3..793b85139c 100644 --- a/src/dawn_node/binding/GPUQuerySet.h +++ b/src/dawn/node/binding/GPUQuerySet.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -28,7 +28,7 @@ namespace wgpu::binding { GPUQuerySet(wgpu::QuerySet query_set); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::QuerySet &() const { + inline operator const wgpu::QuerySet&() const { return query_set_; } diff --git a/src/dawn_node/binding/GPUQueue.cpp b/src/dawn/node/binding/GPUQueue.cpp similarity index 95% rename from src/dawn_node/binding/GPUQueue.cpp rename to src/dawn/node/binding/GPUQueue.cpp index 3b0f681229..e7f7a7290a 100644 --- a/src/dawn_node/binding/GPUQueue.cpp +++ b/src/dawn/node/binding/GPUQueue.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUQueue.h" +#include "src/dawn/node/binding/GPUQueue.h" #include -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/binding/GPUCommandBuffer.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/binding/GPUCommandBuffer.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUQueue.h b/src/dawn/node/binding/GPUQueue.h similarity index 96% rename from src/dawn_node/binding/GPUQueue.h rename to src/dawn/node/binding/GPUQueue.h index f59b19f1b9..b04883771e 100644 --- a/src/dawn_node/binding/GPUQueue.h +++ b/src/dawn/node/binding/GPUQueue.h @@ -18,8 +18,8 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/binding/AsyncRunner.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/binding/AsyncRunner.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPURenderBundle.cpp b/src/dawn/node/binding/GPURenderBundle.cpp similarity index 80% rename from src/dawn_node/binding/GPURenderBundle.cpp rename to src/dawn/node/binding/GPURenderBundle.cpp index f49c900756..c136d03439 100644 --- a/src/dawn_node/binding/GPURenderBundle.cpp +++ b/src/dawn/node/binding/GPURenderBundle.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPURenderBundle.h" +#include "src/dawn/node/binding/GPURenderBundle.h" -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/binding/GPURenderBundle.h" -#include "src/dawn_node/binding/GPURenderPipeline.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/binding/GPURenderBundle.h" +#include "src/dawn/node/binding/GPURenderPipeline.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPURenderBundle.h b/src/dawn/node/binding/GPURenderBundle.h similarity index 93% rename from src/dawn_node/binding/GPURenderBundle.h rename to src/dawn/node/binding/GPURenderBundle.h index bde0b50c27..6c7948e52b 100644 --- a/src/dawn_node/binding/GPURenderBundle.h +++ b/src/dawn/node/binding/GPURenderBundle.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -29,7 +29,7 @@ namespace wgpu::binding { GPURenderBundle(wgpu::RenderBundle bundle); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::RenderBundle &() const { + inline operator const wgpu::RenderBundle&() const { return bundle_; } diff --git a/src/dawn_node/binding/GPURenderBundleEncoder.cpp b/src/dawn/node/binding/GPURenderBundleEncoder.cpp similarity index 95% rename from src/dawn_node/binding/GPURenderBundleEncoder.cpp rename to src/dawn/node/binding/GPURenderBundleEncoder.cpp index fcd7219040..6c3fe9961c 100644 --- a/src/dawn_node/binding/GPURenderBundleEncoder.cpp +++ b/src/dawn/node/binding/GPURenderBundleEncoder.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPURenderBundleEncoder.h" +#include "src/dawn/node/binding/GPURenderBundleEncoder.h" -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/binding/GPUBindGroup.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/binding/GPURenderBundle.h" -#include "src/dawn_node/binding/GPURenderPipeline.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/binding/GPUBindGroup.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/binding/GPURenderBundle.h" +#include "src/dawn/node/binding/GPURenderPipeline.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPURenderBundleEncoder.h b/src/dawn/node/binding/GPURenderBundleEncoder.h similarity index 99% rename from src/dawn_node/binding/GPURenderBundleEncoder.h rename to src/dawn/node/binding/GPURenderBundleEncoder.h index 9a4dbcb376..11ced26486 100644 --- a/src/dawn_node/binding/GPURenderBundleEncoder.h +++ b/src/dawn/node/binding/GPURenderBundleEncoder.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPURenderPassEncoder.cpp b/src/dawn/node/binding/GPURenderPassEncoder.cpp similarity index 95% rename from src/dawn_node/binding/GPURenderPassEncoder.cpp rename to src/dawn/node/binding/GPURenderPassEncoder.cpp index 3306259971..830843106d 100644 --- a/src/dawn_node/binding/GPURenderPassEncoder.cpp +++ b/src/dawn/node/binding/GPURenderPassEncoder.cpp @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPURenderPassEncoder.h" +#include "src/dawn/node/binding/GPURenderPassEncoder.h" -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/binding/GPUBindGroup.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/binding/GPUQuerySet.h" -#include "src/dawn_node/binding/GPURenderBundle.h" -#include "src/dawn_node/binding/GPURenderPipeline.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/binding/GPUBindGroup.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/binding/GPUQuerySet.h" +#include "src/dawn/node/binding/GPURenderBundle.h" +#include "src/dawn/node/binding/GPURenderPipeline.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPURenderPassEncoder.h b/src/dawn/node/binding/GPURenderPassEncoder.h similarity index 97% rename from src/dawn_node/binding/GPURenderPassEncoder.h rename to src/dawn/node/binding/GPURenderPassEncoder.h index ecca2fbae8..437b10b628 100644 --- a/src/dawn_node/binding/GPURenderPassEncoder.h +++ b/src/dawn/node/binding/GPURenderPassEncoder.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -29,7 +29,7 @@ namespace wgpu::binding { GPURenderPassEncoder(wgpu::RenderPassEncoder enc); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::RenderPassEncoder &() const { + inline operator const wgpu::RenderPassEncoder&() const { return enc_; } diff --git a/src/dawn_node/binding/GPURenderPipeline.cpp b/src/dawn/node/binding/GPURenderPipeline.cpp similarity index 88% rename from src/dawn_node/binding/GPURenderPipeline.cpp rename to src/dawn/node/binding/GPURenderPipeline.cpp index 9683b80349..58003d987e 100644 --- a/src/dawn_node/binding/GPURenderPipeline.cpp +++ b/src/dawn/node/binding/GPURenderPipeline.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPURenderPipeline.h" +#include "src/dawn/node/binding/GPURenderPipeline.h" -#include "src/dawn_node/binding/GPUBindGroupLayout.h" -#include "src/dawn_node/binding/GPUBuffer.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/GPUBindGroupLayout.h" +#include "src/dawn/node/binding/GPUBuffer.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPURenderPipeline.h b/src/dawn/node/binding/GPURenderPipeline.h similarity index 94% rename from src/dawn_node/binding/GPURenderPipeline.h rename to src/dawn/node/binding/GPURenderPipeline.h index acb8c53649..78a5c095bb 100644 --- a/src/dawn_node/binding/GPURenderPipeline.h +++ b/src/dawn/node/binding/GPURenderPipeline.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -29,7 +29,7 @@ namespace wgpu::binding { GPURenderPipeline(wgpu::RenderPipeline pipeline); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::RenderPipeline &() const { + inline operator const wgpu::RenderPipeline&() const { return pipeline_; } diff --git a/src/dawn_node/binding/GPUSampler.cpp b/src/dawn/node/binding/GPUSampler.cpp similarity index 89% rename from src/dawn_node/binding/GPUSampler.cpp rename to src/dawn/node/binding/GPUSampler.cpp index 39d87a03ef..70f653603c 100644 --- a/src/dawn_node/binding/GPUSampler.cpp +++ b/src/dawn/node/binding/GPUSampler.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUSampler.h" +#include "src/dawn/node/binding/GPUSampler.h" -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUSampler.h b/src/dawn/node/binding/GPUSampler.h similarity index 93% rename from src/dawn_node/binding/GPUSampler.h rename to src/dawn/node/binding/GPUSampler.h index 9bae3881cb..1b925b08f3 100644 --- a/src/dawn_node/binding/GPUSampler.h +++ b/src/dawn/node/binding/GPUSampler.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { // GPUSampler is an implementation of interop::GPUSampler that wraps a wgpu::Sampler. @@ -27,7 +27,7 @@ namespace wgpu::binding { GPUSampler(wgpu::Sampler sampler); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::Sampler &() const { + inline operator const wgpu::Sampler&() const { return sampler_; } diff --git a/src/dawn_node/binding/GPUShaderModule.cpp b/src/dawn/node/binding/GPUShaderModule.cpp similarity index 98% rename from src/dawn_node/binding/GPUShaderModule.cpp rename to src/dawn/node/binding/GPUShaderModule.cpp index 6ac66456ec..a889fdbe92 100644 --- a/src/dawn_node/binding/GPUShaderModule.cpp +++ b/src/dawn/node/binding/GPUShaderModule.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUShaderModule.h" +#include "src/dawn/node/binding/GPUShaderModule.h" #include -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUShaderModule.h b/src/dawn/node/binding/GPUShaderModule.h similarity index 91% rename from src/dawn_node/binding/GPUShaderModule.h rename to src/dawn/node/binding/GPUShaderModule.h index 57c49ddb6f..6bb7714333 100644 --- a/src/dawn_node/binding/GPUShaderModule.h +++ b/src/dawn/node/binding/GPUShaderModule.h @@ -18,8 +18,8 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/binding/AsyncRunner.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/binding/AsyncRunner.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -30,7 +30,7 @@ namespace wgpu::binding { GPUShaderModule(wgpu::ShaderModule shader, std::shared_ptr async); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::ShaderModule &() const { + inline operator const wgpu::ShaderModule&() const { return shader_; } diff --git a/src/dawn_node/binding/GPUSupportedLimits.cpp b/src/dawn/node/binding/GPUSupportedLimits.cpp similarity index 98% rename from src/dawn_node/binding/GPUSupportedLimits.cpp rename to src/dawn/node/binding/GPUSupportedLimits.cpp index 2c8c881eb8..23c19b2187 100644 --- a/src/dawn_node/binding/GPUSupportedLimits.cpp +++ b/src/dawn/node/binding/GPUSupportedLimits.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUSupportedLimits.h" +#include "src/dawn/node/binding/GPUSupportedLimits.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUSupportedLimits.h b/src/dawn/node/binding/GPUSupportedLimits.h similarity index 98% rename from src/dawn_node/binding/GPUSupportedLimits.h rename to src/dawn/node/binding/GPUSupportedLimits.h index 82b0ea64a5..7a2aa86537 100644 --- a/src/dawn_node/binding/GPUSupportedLimits.h +++ b/src/dawn/node/binding/GPUSupportedLimits.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUTexture.cpp b/src/dawn/node/binding/GPUTexture.cpp similarity index 90% rename from src/dawn_node/binding/GPUTexture.cpp rename to src/dawn/node/binding/GPUTexture.cpp index 3257f15ace..0387248450 100644 --- a/src/dawn_node/binding/GPUTexture.cpp +++ b/src/dawn/node/binding/GPUTexture.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUTexture.h" +#include "src/dawn/node/binding/GPUTexture.h" -#include "src/dawn_node/binding/Converter.h" -#include "src/dawn_node/binding/Errors.h" -#include "src/dawn_node/binding/GPUTextureView.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/binding/Converter.h" +#include "src/dawn/node/binding/Errors.h" +#include "src/dawn/node/binding/GPUTextureView.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUTexture.h b/src/dawn/node/binding/GPUTexture.h similarity index 94% rename from src/dawn_node/binding/GPUTexture.h rename to src/dawn/node/binding/GPUTexture.h index 29e7621203..f7dbe9180a 100644 --- a/src/dawn_node/binding/GPUTexture.h +++ b/src/dawn/node/binding/GPUTexture.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -28,7 +28,7 @@ namespace wgpu::binding { GPUTexture(wgpu::Texture texture); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::Texture &() const { + inline operator const wgpu::Texture&() const { return texture_; } diff --git a/src/dawn_node/binding/GPUTextureView.cpp b/src/dawn/node/binding/GPUTextureView.cpp similarity index 92% rename from src/dawn_node/binding/GPUTextureView.cpp rename to src/dawn/node/binding/GPUTextureView.cpp index 11aa55f92d..1e183dbda8 100644 --- a/src/dawn_node/binding/GPUTextureView.cpp +++ b/src/dawn/node/binding/GPUTextureView.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/binding/GPUTextureView.h" +#include "src/dawn/node/binding/GPUTextureView.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu::binding { diff --git a/src/dawn_node/binding/GPUTextureView.h b/src/dawn/node/binding/GPUTextureView.h similarity index 93% rename from src/dawn_node/binding/GPUTextureView.h rename to src/dawn/node/binding/GPUTextureView.h index 89b972e7e0..4394eab307 100644 --- a/src/dawn_node/binding/GPUTextureView.h +++ b/src/dawn/node/binding/GPUTextureView.h @@ -18,7 +18,7 @@ #include "dawn/webgpu_cpp.h" #include "dawn_native/DawnNative.h" #include "napi.h" -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" namespace wgpu::binding { @@ -29,7 +29,7 @@ namespace wgpu::binding { GPUTextureView(wgpu::TextureView view); // Implicit cast operator to Dawn GPU object - inline operator const wgpu::TextureView &() const { + inline operator const wgpu::TextureView&() const { return view_; } diff --git a/src/dawn_node/interop/Browser.idl b/src/dawn/node/interop/Browser.idl similarity index 100% rename from src/dawn_node/interop/Browser.idl rename to src/dawn/node/interop/Browser.idl diff --git a/src/dawn_node/interop/CMakeLists.txt b/src/dawn/node/interop/CMakeLists.txt similarity index 96% rename from src/dawn_node/interop/CMakeLists.txt rename to src/dawn/node/interop/CMakeLists.txt index e986d5cc4b..98b5695ed5 100644 --- a/src/dawn_node/interop/CMakeLists.txt +++ b/src/dawn/node/interop/CMakeLists.txt @@ -13,7 +13,7 @@ # limitations under the License. # Paths to generated files -set(INTEROP_GEN_DIR "${GEN_DIR}/src/dawn_node/interop") +set(INTEROP_GEN_DIR "${GEN_DIR}/src/dawn/node/interop") set(INTEROP_WEBGPU_H "${INTEROP_GEN_DIR}/WebGPU.h") set(INTEROP_WEBGPU_CPP "${INTEROP_GEN_DIR}/WebGPU.cpp") diff --git a/src/dawn_node/interop/Core.cpp b/src/dawn/node/interop/Core.cpp similarity index 99% rename from src/dawn_node/interop/Core.cpp rename to src/dawn/node/interop/Core.cpp index 7a671c8d1c..a2232ae707 100644 --- a/src/dawn_node/interop/Core.cpp +++ b/src/dawn/node/interop/Core.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/dawn_node/interop/Core.h" +#include "src/dawn/node/interop/Core.h" namespace wgpu::interop { diff --git a/src/dawn_node/interop/Core.h b/src/dawn/node/interop/Core.h similarity index 99% rename from src/dawn_node/interop/Core.h rename to src/dawn/node/interop/Core.h index c0ec61e338..30545695cb 100644 --- a/src/dawn_node/interop/Core.h +++ b/src/dawn/node/interop/Core.h @@ -28,7 +28,7 @@ #include "napi.h" -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" #define ENABLE_INTEROP_LOGGING 0 // Enable for verbose interop logging @@ -124,10 +124,10 @@ namespace wgpu::interop { inline operator napi_value() const { return object; } - inline operator const Napi::Value &() const { + inline operator const Napi::Value&() const { return object; } - inline operator const Napi::Object &() const { + inline operator const Napi::Object&() const { return object; } diff --git a/src/dawn_node/interop/WebGPU.cpp.tmpl b/src/dawn/node/interop/WebGPU.cpp.tmpl similarity index 98% rename from src/dawn_node/interop/WebGPU.cpp.tmpl rename to src/dawn/node/interop/WebGPU.cpp.tmpl index f70df8e1e9..ca6e24a8a0 100644 --- a/src/dawn_node/interop/WebGPU.cpp.tmpl +++ b/src/dawn/node/interop/WebGPU.cpp.tmpl @@ -16,13 +16,13 @@ {{- /* -------------------------------------------------------------------------------- -Template file for use with src/dawn_node/tools/cmd/idlgen/main.go to generate +Template file for use with src/dawn/node/tools/cmd/idlgen/main.go to generate the WebGPU.cpp source file. See: * https://github.com/ben-clayton/webidlparser/blob/main/ast/ast.go for the AST types used by this template -* src/dawn_node/tools/cmd/idlgen/main.go for additional structures and functions +* src/dawn/node/tools/cmd/idlgen/main.go for additional structures and functions used by this template * https://golang.org/pkg/text/template/ for documentation on the template syntax -------------------------------------------------------------------------------- @@ -30,11 +30,11 @@ See: {{- Include "WebGPUCommon.tmpl" -}} -#include "src/dawn_node/interop/WebGPU.h" +#include "src/dawn/node/interop/WebGPU.h" #include -#include "src/dawn_node/utils/Debug.h" +#include "src/dawn/node/utils/Debug.h" namespace wgpu { namespace interop { diff --git a/src/dawn_node/interop/WebGPU.h.tmpl b/src/dawn/node/interop/WebGPU.h.tmpl similarity index 98% rename from src/dawn_node/interop/WebGPU.h.tmpl rename to src/dawn/node/interop/WebGPU.h.tmpl index 5fbb0ae55c..1a1a97040e 100644 --- a/src/dawn_node/interop/WebGPU.h.tmpl +++ b/src/dawn/node/interop/WebGPU.h.tmpl @@ -16,13 +16,13 @@ {{- /* -------------------------------------------------------------------------------- -Template file for use with src/dawn_node/tools/cmd/idlgen/main.go to generate +Template file for use with src/dawn/node/tools/cmd/idlgen/main.go to generate the WebGPU.h header file. See: * https://github.com/ben-clayton/webidlparser/blob/main/ast/ast.go for the AST types used by this template -* src/dawn_node/tools/cmd/idlgen/main.go for additional structures and functions +* src/dawn/node/tools/cmd/idlgen/main.go for additional structures and functions used by this template * https://golang.org/pkg/text/template/ for documentation on the template syntax -------------------------------------------------------------------------------- @@ -33,7 +33,7 @@ See: #ifndef DAWN_NODE_GEN_INTEROP_WEBGPU_H_ #define DAWN_NODE_GEN_INTEROP_WEBGPU_H_ -#include "src/dawn_node/interop/Core.h" +#include "src/dawn/node/interop/Core.h" namespace wgpu { namespace interop { diff --git a/src/dawn_node/interop/WebGPUCommon.tmpl b/src/dawn/node/interop/WebGPUCommon.tmpl similarity index 97% rename from src/dawn_node/interop/WebGPUCommon.tmpl rename to src/dawn/node/interop/WebGPUCommon.tmpl index c47c097f5e..94b2e407c8 100644 --- a/src/dawn_node/interop/WebGPUCommon.tmpl +++ b/src/dawn/node/interop/WebGPUCommon.tmpl @@ -16,14 +16,14 @@ {{- /* -------------------------------------------------------------------------------- -Template file for use with src/dawn_node/tools/cmd/idlgen/main.go. +Template file for use with src/dawn/node/tools/cmd/idlgen/main.go. This file provides common template definitions and is included by WebGPU.h.tmpl and WebGPU.cpp.tmpl. See: * https://github.com/ben-clayton/webidlparser/blob/main/ast/ast.go for the AST types used by this template -* src/dawn_node/tools/cmd/idlgen/main.go for additional structures and functions +* src/dawn/node/tools/cmd/idlgen/main.go for additional structures and functions used by this template * https://golang.org/pkg/text/template/ for documentation on the template syntax -------------------------------------------------------------------------------- diff --git a/src/dawn_node/tools/go.mod b/src/dawn/node/tools/go.mod similarity index 76% rename from src/dawn_node/tools/go.mod rename to src/dawn/node/tools/go.mod index e39e222e92..b5eb8dfb50 100644 --- a/src/dawn_node/tools/go.mod +++ b/src/dawn/node/tools/go.mod @@ -1,4 +1,4 @@ -module dawn.googlesource.com/dawn/src/dawn_node/tools +module dawn.googlesource.com/dawn/src/dawn/node/tools go 1.16 diff --git a/src/dawn_node/tools/go.sum b/src/dawn/node/tools/go.sum similarity index 100% rename from src/dawn_node/tools/go.sum rename to src/dawn/node/tools/go.sum diff --git a/src/dawn_node/tools/run-cts b/src/dawn/node/tools/run-cts similarity index 100% rename from src/dawn_node/tools/run-cts rename to src/dawn/node/tools/run-cts diff --git a/src/dawn_node/tools/src/cmd/idlgen/main.go b/src/dawn/node/tools/src/cmd/idlgen/main.go similarity index 100% rename from src/dawn_node/tools/src/cmd/idlgen/main.go rename to src/dawn/node/tools/src/cmd/idlgen/main.go diff --git a/src/dawn_node/tools/src/cmd/run-cts/main.go b/src/dawn/node/tools/src/cmd/run-cts/main.go similarity index 100% rename from src/dawn_node/tools/src/cmd/run-cts/main.go rename to src/dawn/node/tools/src/cmd/run-cts/main.go diff --git a/src/dawn_node/utils/Debug.h b/src/dawn/node/utils/Debug.h similarity index 100% rename from src/dawn_node/utils/Debug.h rename to src/dawn/node/utils/Debug.h