Use #include <webgpu/*> instead of #include "dawn/*" Updates all the includes to (1) note that these are headers from the include directories via angle braces, and (2) use the headers from the "webgpu" directory instead of the "dawn" directory. This allows us to override the headers i.e. in Emscripten case, to point to the correct header. Change-Id: Ic4ceaeed7e4379df65a8a159e40d57ad9e1ac290 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/199954 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Loko Kung <lokokung@google.com> Reviewed-by: Kai Ninomiya <kainino@chromium.org>
diff --git a/docs/quickstart-cmake.md b/docs/quickstart-cmake.md index 942f30f..1cce6d8 100644 --- a/docs/quickstart-cmake.md +++ b/docs/quickstart-cmake.md
@@ -62,9 +62,10 @@ Now, create a `hello_webgpu.cpp` C++ file within the `TestDawn` directory. ```cpp +#include <webgpu/webgpu_cpp.h> + #include <cstdlib> #include <iostream> -#include <webgpu/webgpu_cpp.h> int main(int argc, char *argv[]) { wgpu::InstanceDescriptor instanceDescriptor{};
diff --git a/generator/templates/api.h b/generator/templates/api.h index 1ed93ca..abd55e4 100644 --- a/generator/templates/api.h +++ b/generator/templates/api.h
@@ -30,9 +30,8 @@ {% if 'dawn' in enabled_tags %} #ifdef __EMSCRIPTEN__ - // When using Emscripten, just forward to including the Emscripten header. - #include "webgpu/webgpu.h" - #else + #error "Do not include this header. Emscripten already provides headers needed for {{metadata.api}}." + #endif {% endif %} #ifndef {{metadata.api.upper()}}_H_ @@ -301,7 +300,3 @@ #endif #endif // {{metadata.api.upper()}}_H_ - -{% if 'dawn' in enabled_tags %} - #endif // __EMSCRIPTEN__ -{% endif %}
diff --git a/generator/templates/api_cpp.h b/generator/templates/api_cpp.h index debffef7..e88d34a 100644 --- a/generator/templates/api_cpp.h +++ b/generator/templates/api_cpp.h
@@ -32,9 +32,8 @@ {% if 'dawn' in enabled_tags %} #ifdef __EMSCRIPTEN__ - // When using Emscripten, just forward to including the Emscripten header. - #include "webgpu/webgpu_cpp.h" - #else + #error "Do not include this header. Emscripten already provides headers needed for {{metadata.api}}." + #endif {% endif %} {% set PREFIX = "" if not c_namespace else c_namespace.SNAKE_CASE() + "_" %} @@ -956,7 +955,3 @@ } // namespace std #endif // {{PREFIX}}{{API}}_CPP_H_ - -{% if 'dawn' in enabled_tags %} - #endif // __EMSCRIPTEN__ -{% endif %}
diff --git a/generator/templates/api_cpp_chained_struct.h b/generator/templates/api_cpp_chained_struct.h index b2e10d5..df0f9fe 100644 --- a/generator/templates/api_cpp_chained_struct.h +++ b/generator/templates/api_cpp_chained_struct.h
@@ -28,9 +28,8 @@ {% if 'dawn' in enabled_tags %} #ifdef __EMSCRIPTEN__ - // When using Emscripten, just forward to including the Emscripten header. - #include "webgpu/webgpu_cpp_chained_struct.h" - #else + #error "Do not include this header. Emscripten already provides headers needed for {{metadata.api}}." + #endif {% endif %} #ifndef {{API}}_CPP_CHAINED_STRUCT_H_ @@ -59,7 +58,3 @@ } // namespace {{metadata.namespace}}} #endif // {{API}}_CPP_CHAINED_STRUCT_H_ - -{% if 'dawn' in enabled_tags %} - #endif // __EMSCRIPTEN__ -{% endif %}
diff --git a/generator/templates/art/methods.cpp b/generator/templates/art/methods.cpp index c48d96d..67d1538 100644 --- a/generator/templates/art/methods.cpp +++ b/generator/templates/art/methods.cpp
@@ -28,8 +28,8 @@ {% from 'art/api_jni_types.kt' import arg_to_jni_type, convert_to_kotlin, jni_signature, to_jni_type with context %} #include <jni.h> #include <stdlib.h> +#include <webgpu/webgpu.h> -#include "dawn/webgpu.h" #include "JNIContext.h" #include "structures.h"
diff --git a/generator/templates/art/structures.cpp b/generator/templates/art/structures.cpp index f40f7d6..16ce7c8 100644 --- a/generator/templates/art/structures.cpp +++ b/generator/templates/art/structures.cpp
@@ -29,9 +29,9 @@ #include "structures.h" #include <jni.h> +#include <webgpu/webgpu.h> #include "dawn/common/Assert.h" -#include "dawn/webgpu.h" #include "JNIContext.h" // Converts Kotlin objects representing Dawn structures into native structures that can be passed
diff --git a/generator/templates/art/structures.h b/generator/templates/art/structures.h index 5970b22..31bb793 100644 --- a/generator/templates/art/structures.h +++ b/generator/templates/art/structures.h
@@ -25,8 +25,7 @@ //* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE //* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <jni.h> - -#include "dawn/webgpu.h" +#include <webgpu/webgpu.h> namespace dawn::kotlin_api {
diff --git a/generator/templates/dawn/fuzzers/lpmfuzz/DawnLPMSerializer.cpp b/generator/templates/dawn/fuzzers/lpmfuzz/DawnLPMSerializer.cpp index f544e19..17bace6 100644 --- a/generator/templates/dawn/fuzzers/lpmfuzz/DawnLPMSerializer.cpp +++ b/generator/templates/dawn/fuzzers/lpmfuzz/DawnLPMSerializer.cpp
@@ -25,12 +25,13 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <webgpu/webgpu.h> + #include "dawn/fuzzers/lpmfuzz/DawnLPMConstants_autogen.h" #include "dawn/fuzzers/lpmfuzz/DawnLPMFuzzer.h" #include "dawn/fuzzers/lpmfuzz/DawnLPMObjectStore.h" #include "dawn/fuzzers/lpmfuzz/DawnLPMSerializer_autogen.h" #include "dawn/fuzzers/lpmfuzz/DawnLPMSerializerCustom.h" -#include "dawn/webgpu.h" #include "dawn/wire/BufferConsumer_impl.h" #include "dawn/wire/ObjectHandle.h" #include "dawn/wire/Wire.h"
diff --git a/generator/templates/dawn/wire/WireCmd.h b/generator/templates/dawn/wire/WireCmd.h index a49c695..ba1542a 100644 --- a/generator/templates/dawn/wire/WireCmd.h +++ b/generator/templates/dawn/wire/WireCmd.h
@@ -28,7 +28,7 @@ #ifndef DAWNWIRE_WIRECMD_AUTOGEN_H_ #define DAWNWIRE_WIRECMD_AUTOGEN_H_ -#include "dawn/webgpu.h" +#include <webgpu/webgpu.h> #include "dawn/wire/BufferConsumer.h" #include "dawn/wire/ObjectType_autogen.h"
diff --git a/include/dawn/dawn_proc.h b/include/dawn/dawn_proc.h index 513b0bf..585f633 100644 --- a/include/dawn/dawn_proc.h +++ b/include/dawn/dawn_proc.h
@@ -28,8 +28,9 @@ #ifndef INCLUDE_DAWN_DAWN_PROC_H_ #define INCLUDE_DAWN_DAWN_PROC_H_ +#include <webgpu/webgpu.h> + #include "dawn/dawn_proc_table.h" -#include "dawn/webgpu.h" #ifdef __cplusplus extern "C" {
diff --git a/include/dawn/native/D3DBackend.h b/include/dawn/native/D3DBackend.h index cafbdf7..52f86e6 100644 --- a/include/dawn/native/D3DBackend.h +++ b/include/dawn/native/D3DBackend.h
@@ -29,6 +29,7 @@ #define INCLUDE_DAWN_NATIVE_D3DBACKEND_H_ #include <dxgi1_4.h> +#include <webgpu/webgpu_cpp_chained_struct.h> #include <windows.h> #include <wrl/client.h> @@ -36,7 +37,6 @@ #include <vector> #include "dawn/native/DawnNative.h" -#include "webgpu/webgpu_cpp_chained_struct.h" namespace dawn::native::d3d {
diff --git a/include/dawn/native/DawnNative.h b/include/dawn/native/DawnNative.h index f75a3cf..c910f50 100644 --- a/include/dawn/native/DawnNative.h +++ b/include/dawn/native/DawnNative.h
@@ -28,13 +28,14 @@ #ifndef INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_ #define INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include <string_view> #include <vector> #include "dawn/dawn_proc_table.h" #include "dawn/native/dawn_native_export.h" -#include "dawn/webgpu_cpp.h" namespace dawn::platform { class Platform;
diff --git a/include/dawn/native/MetalBackend.h b/include/dawn/native/MetalBackend.h index a0ff892..c2cb0ab 100644 --- a/include/dawn/native/MetalBackend.h +++ b/include/dawn/native/MetalBackend.h
@@ -28,8 +28,9 @@ #ifndef INCLUDE_DAWN_NATIVE_METALBACKEND_H_ #define INCLUDE_DAWN_NATIVE_METALBACKEND_H_ +#include <webgpu/webgpu.h> + #include "dawn/native/dawn_native_export.h" -#include "dawn/webgpu.h" #if defined(__OBJC__) #import <Metal/Metal.h>
diff --git a/include/dawn/platform/DawnPlatform.h b/include/dawn/platform/DawnPlatform.h index aacdf0c..334aadb 100644 --- a/include/dawn/platform/DawnPlatform.h +++ b/include/dawn/platform/DawnPlatform.h
@@ -28,12 +28,13 @@ #ifndef INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_ #define INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_ +#include <webgpu/webgpu.h> + #include <cstddef> #include <cstdint> #include <memory> #include "dawn/platform/dawn_platform_export.h" -#include "dawn/webgpu.h" namespace dawn::platform {
diff --git a/include/dawn/wire/Wire.h b/include/dawn/wire/Wire.h index 1d5836b..7f01e81 100644 --- a/include/dawn/wire/Wire.h +++ b/include/dawn/wire/Wire.h
@@ -28,10 +28,11 @@ #ifndef INCLUDE_DAWN_WIRE_WIRE_H_ #define INCLUDE_DAWN_WIRE_WIRE_H_ +#include <webgpu/webgpu.h> + #include <cstdint> #include <limits> -#include "dawn/webgpu.h" #include "dawn/wire/dawn_wire_export.h" namespace dawn::wire {
diff --git a/src/dawn/common/FutureUtils.h b/src/dawn/common/FutureUtils.h index b25224c..1d3288d 100644 --- a/src/dawn/common/FutureUtils.h +++ b/src/dawn/common/FutureUtils.h
@@ -28,11 +28,11 @@ #ifndef SRC_DAWN_COMMON_FUTUREUTILS_H_ #define SRC_DAWN_COMMON_FUTUREUTILS_H_ +#include <webgpu/webgpu.h> + #include <cstddef> #include <cstdint> -#include "dawn/webgpu.h" - namespace dawn { using FutureID = uint64_t;
diff --git a/src/dawn/common/IOSurfaceUtils.h b/src/dawn/common/IOSurfaceUtils.h index ec7ae0e..01238bd 100644 --- a/src/dawn/common/IOSurfaceUtils.h +++ b/src/dawn/common/IOSurfaceUtils.h
@@ -30,7 +30,7 @@ #include <IOSurface/IOSurfaceRef.h> -#include "dawn/webgpu_cpp.h" +#include <webgpu/webgpu_cpp.h> namespace dawn {
diff --git a/src/dawn/fuzzers/DawnWireServerFuzzer.cpp b/src/dawn/fuzzers/DawnWireServerFuzzer.cpp index 61497f8..5f8c19d 100644 --- a/src/dawn/fuzzers/DawnWireServerFuzzer.cpp +++ b/src/dawn/fuzzers/DawnWireServerFuzzer.cpp
@@ -27,6 +27,8 @@ #include "dawn/fuzzers/DawnWireServerFuzzer.h" +#include <webgpu/webgpu_cpp.h> + #include <fstream> #include <memory> #include <vector> @@ -38,7 +40,6 @@ #include "dawn/dawn_proc.h" #include "dawn/native/DawnNative.h" #include "dawn/utils/SystemUtils.h" -#include "dawn/webgpu_cpp.h" #include "dawn/wire/WireServer.h" namespace {
diff --git a/src/dawn/fuzzers/DawnWireServerFuzzer.h b/src/dawn/fuzzers/DawnWireServerFuzzer.h index ea673b0..f28b8ba 100644 --- a/src/dawn/fuzzers/DawnWireServerFuzzer.h +++ b/src/dawn/fuzzers/DawnWireServerFuzzer.h
@@ -28,11 +28,11 @@ #ifndef SRC_DAWN_FUZZERS_DAWNWIRESERVERFUZZER_H_ #define SRC_DAWN_FUZZERS_DAWNWIRESERVERFUZZER_H_ +#include <webgpu/webgpu_cpp.h> + #include <cstdint> #include <functional> -#include "dawn/webgpu_cpp.h" - namespace dawn::native { class Adapter;
diff --git a/src/dawn/fuzzers/lpmfuzz/DawnLPMFuzzer.cpp b/src/dawn/fuzzers/lpmfuzz/DawnLPMFuzzer.cpp index fbe0259..43d046c 100644 --- a/src/dawn/fuzzers/lpmfuzz/DawnLPMFuzzer.cpp +++ b/src/dawn/fuzzers/lpmfuzz/DawnLPMFuzzer.cpp
@@ -25,6 +25,8 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <webgpu/webgpu_cpp.h> + #include <fstream> #include <memory> #include <vector> @@ -40,7 +42,6 @@ #include "dawn/native/DawnNative.h" #include "dawn/utils/SystemUtils.h" #include "dawn/utils/TerribleCommandBuffer.h" -#include "dawn/webgpu_cpp.h" #include "dawn/wire/ChunkedCommandSerializer.h" #include "dawn/wire/WireClient.h" #include "dawn/wire/WireResult.h"
diff --git a/src/dawn/fuzzers/lpmfuzz/DawnLPMFuzzer.h b/src/dawn/fuzzers/lpmfuzz/DawnLPMFuzzer.h index bf50658..2103f75 100644 --- a/src/dawn/fuzzers/lpmfuzz/DawnLPMFuzzer.h +++ b/src/dawn/fuzzers/lpmfuzz/DawnLPMFuzzer.h
@@ -28,8 +28,9 @@ #ifndef SRC_DAWN_FUZZERS_DAWNLPMFUZZER_H_ #define SRC_DAWN_FUZZERS_DAWNLPMFUZZER_H_ +#include <webgpu/webgpu_cpp.h> + #include "dawn/fuzzers/lpmfuzz/dawn_lpm_autogen.pb.h" -#include "dawn/webgpu_cpp.h" namespace dawn::native {
diff --git a/src/dawn/fuzzers/lpmfuzz/DawnLPMSerializerCustom.cpp b/src/dawn/fuzzers/lpmfuzz/DawnLPMSerializerCustom.cpp index d3f4e6f..e84ec29 100644 --- a/src/dawn/fuzzers/lpmfuzz/DawnLPMSerializerCustom.cpp +++ b/src/dawn/fuzzers/lpmfuzz/DawnLPMSerializerCustom.cpp
@@ -25,13 +25,14 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <webgpu/webgpu.h> + #include <algorithm> #include "dawn/fuzzers/lpmfuzz/DawnLPMConstants_autogen.h" #include "dawn/fuzzers/lpmfuzz/DawnLPMObjectStore.h" #include "dawn/fuzzers/lpmfuzz/DawnLPMSerializerCustom.h" #include "dawn/fuzzers/lpmfuzz/DawnLPMSerializer_autogen.h" -#include "dawn/webgpu.h" #include "dawn/wire/ChunkedCommandSerializer.h" #include "dawn/wire/ObjectType_autogen.h"
diff --git a/src/dawn/native/CreatePipelineAsyncEvent.cpp b/src/dawn/native/CreatePipelineAsyncEvent.cpp index c248f82..b9cf956 100644 --- a/src/dawn/native/CreatePipelineAsyncEvent.cpp +++ b/src/dawn/native/CreatePipelineAsyncEvent.cpp
@@ -27,6 +27,8 @@ #include "dawn/native/CreatePipelineAsyncEvent.h" +#include <webgpu/webgpu.h> + #include <utility> #include "dawn/common/FutureUtils.h" @@ -45,7 +47,6 @@ #include "dawn/platform/DawnPlatform.h" #include "dawn/platform/metrics/HistogramMacros.h" #include "dawn/platform/tracing/TraceEvent.h" -#include "dawn/webgpu.h" namespace dawn::native {
diff --git a/src/dawn/native/CreatePipelineAsyncEvent.h b/src/dawn/native/CreatePipelineAsyncEvent.h index 5407d8e..569493b 100644 --- a/src/dawn/native/CreatePipelineAsyncEvent.h +++ b/src/dawn/native/CreatePipelineAsyncEvent.h
@@ -28,6 +28,8 @@ #ifndef SRC_DAWN_NATIVE_CREATEPIPELINEASYNCEVENT_H_ #define SRC_DAWN_NATIVE_CREATEPIPELINEASYNCEVENT_H_ +#include <webgpu/webgpu.h> + #include <memory> #include <string> #include <type_traits> @@ -37,7 +39,6 @@ #include "dawn/native/Error.h" #include "dawn/native/EventManager.h" #include "dawn/native/Pipeline.h" -#include "dawn/webgpu.h" #include "partition_alloc/pointers/raw_ptr.h" namespace dawn::native {
diff --git a/src/dawn/native/Device.cpp b/src/dawn/native/Device.cpp index fb2ac7a..39b59c6 100644 --- a/src/dawn/native/Device.cpp +++ b/src/dawn/native/Device.cpp
@@ -27,6 +27,8 @@ #include "dawn/native/Device.h" +#include <webgpu/webgpu.h> + #include <algorithm> #include <array> #include <mutex> @@ -77,7 +79,6 @@ #include "dawn/platform/DawnPlatform.h" #include "dawn/platform/metrics/HistogramMacros.h" #include "dawn/platform/tracing/TraceEvent.h" -#include "dawn/webgpu.h" #include "partition_alloc/pointers/raw_ptr.h" namespace dawn::native {
diff --git a/src/dawn/native/Features.h b/src/dawn/native/Features.h index be1a88b..f97359e 100644 --- a/src/dawn/native/Features.h +++ b/src/dawn/native/Features.h
@@ -28,6 +28,8 @@ #ifndef SRC_DAWN_NATIVE_FEATURES_H_ #define SRC_DAWN_NATIVE_FEATURES_H_ +#include <webgpu/webgpu_cpp.h> + #include <bitset> #include <string> #include <vector> @@ -35,7 +37,6 @@ #include "dawn/common/ityp_bitset.h" #include "dawn/native/DawnNative.h" #include "dawn/native/Features_autogen.h" -#include "dawn/webgpu_cpp.h" namespace dawn::native {
diff --git a/src/dawn/native/Queue.cpp b/src/dawn/native/Queue.cpp index eb6a732..a8197d2 100644 --- a/src/dawn/native/Queue.cpp +++ b/src/dawn/native/Queue.cpp
@@ -27,6 +27,8 @@ #include "dawn/native/Queue.h" +#include <webgpu/webgpu.h> + #include <algorithm> #include <cstring> #include <set> @@ -57,7 +59,6 @@ #include "dawn/native/Texture.h" #include "dawn/platform/DawnPlatform.h" #include "dawn/platform/tracing/TraceEvent.h" -#include "dawn/webgpu.h" #include "partition_alloc/pointers/raw_ptr.h" namespace dawn::native {
diff --git a/src/dawn/native/dawn_platform.h b/src/dawn/native/dawn_platform.h index f30940f..11e9b0b 100644 --- a/src/dawn/native/dawn_platform.h +++ b/src/dawn/native/dawn_platform.h
@@ -29,7 +29,7 @@ #define SRC_DAWN_NATIVE_DAWN_PLATFORM_H_ // Use webgpu_cpp to have the enum and bitfield definitions -#include "dawn/webgpu_cpp.h" +#include <webgpu/webgpu_cpp.h> #include "dawn/native/dawn_platform_autogen.h"
diff --git a/src/dawn/node/binding/AsyncRunner.h b/src/dawn/node/binding/AsyncRunner.h index e66b4a2..00e2b52 100644 --- a/src/dawn/node/binding/AsyncRunner.h +++ b/src/dawn/node/binding/AsyncRunner.h
@@ -29,11 +29,13 @@ #define SRC_DAWN_NODE_BINDING_ASYNCRUNNER_H_ #include <stdint.h> + +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <utility> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/Core.h" #include "src/dawn/node/interop/NodeAPI.h"
diff --git a/src/dawn/node/binding/Converter.h b/src/dawn/node/binding/Converter.h index ad0aef0..363d076 100644 --- a/src/dawn/node/binding/Converter.h +++ b/src/dawn/node/binding/Converter.h
@@ -28,6 +28,8 @@ #ifndef SRC_DAWN_NODE_BINDING_CONVERTER_H_ #define SRC_DAWN_NODE_BINDING_CONVERTER_H_ +#include <webgpu/webgpu_cpp.h> + #include <functional> #include <string> #include <type_traits> @@ -36,7 +38,6 @@ #include <vector> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/binding/Errors.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPU.h b/src/dawn/node/binding/GPU.h index 1ecf465..64c2a35 100644 --- a/src/dawn/node/binding/GPU.h +++ b/src/dawn/node/binding/GPU.h
@@ -28,11 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPU_H_ #define SRC_DAWN_NODE_BINDING_GPU_H_ +#include <webgpu/webgpu_cpp.h> + #include <memory> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" - #include "src/dawn/node/binding/AsyncRunner.h" #include "src/dawn/node/binding/Flags.h" #include "src/dawn/node/interop/NodeAPI.h"
diff --git a/src/dawn/node/binding/GPUAdapter.h b/src/dawn/node/binding/GPUAdapter.h index 87f5307..f6f9219 100644 --- a/src/dawn/node/binding/GPUAdapter.h +++ b/src/dawn/node/binding/GPUAdapter.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUADAPTER_H_ #define SRC_DAWN_NODE_BINDING_GPUADAPTER_H_ +#include <webgpu/webgpu_cpp.h> + #include <memory> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/binding/AsyncRunner.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUAdapterInfo.h b/src/dawn/node/binding/GPUAdapterInfo.h index caa308f..316e78f 100644 --- a/src/dawn/node/binding/GPUAdapterInfo.h +++ b/src/dawn/node/binding/GPUAdapterInfo.h
@@ -28,11 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUADAPTERINFO_H_ #define SRC_DAWN_NODE_BINDING_GPUADAPTERINFO_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" - #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUBindGroup.h b/src/dawn/node/binding/GPUBindGroup.h index 23287f3..a3ca20c 100644 --- a/src/dawn/node/binding/GPUBindGroup.h +++ b/src/dawn/node/binding/GPUBindGroup.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUBINDGROUP_H_ #define SRC_DAWN_NODE_BINDING_GPUBINDGROUP_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUBindGroupLayout.h b/src/dawn/node/binding/GPUBindGroupLayout.h index 4c0c517..c369c60 100644 --- a/src/dawn/node/binding/GPUBindGroupLayout.h +++ b/src/dawn/node/binding/GPUBindGroupLayout.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUBINDGROUPLAYOUT_H_ #define SRC_DAWN_NODE_BINDING_GPUBINDGROUPLAYOUT_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUBuffer.h b/src/dawn/node/binding/GPUBuffer.h index 24f4a93..3da588c 100644 --- a/src/dawn/node/binding/GPUBuffer.h +++ b/src/dawn/node/binding/GPUBuffer.h
@@ -28,12 +28,13 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUBUFFER_H_ #define SRC_DAWN_NODE_BINDING_GPUBUFFER_H_ +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <string> #include <vector> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/binding/AsyncRunner.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUCommandBuffer.h b/src/dawn/node/binding/GPUCommandBuffer.h index 7fea518..374cb3f 100644 --- a/src/dawn/node/binding/GPUCommandBuffer.h +++ b/src/dawn/node/binding/GPUCommandBuffer.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUCOMMANDBUFFER_H_ #define SRC_DAWN_NODE_BINDING_GPUCOMMANDBUFFER_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUCommandEncoder.h b/src/dawn/node/binding/GPUCommandEncoder.h index 182cf19..7f527d9 100644 --- a/src/dawn/node/binding/GPUCommandEncoder.h +++ b/src/dawn/node/binding/GPUCommandEncoder.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUCOMMANDENCODER_H_ #define SRC_DAWN_NODE_BINDING_GPUCOMMANDENCODER_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUComputePassEncoder.h b/src/dawn/node/binding/GPUComputePassEncoder.h index c478fb4..3804977 100644 --- a/src/dawn/node/binding/GPUComputePassEncoder.h +++ b/src/dawn/node/binding/GPUComputePassEncoder.h
@@ -28,11 +28,12 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUCOMPUTEPASSENCODER_H_ #define SRC_DAWN_NODE_BINDING_GPUCOMPUTEPASSENCODER_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include <vector> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUComputePipeline.h b/src/dawn/node/binding/GPUComputePipeline.h index 52ebef3..cf91ad4 100644 --- a/src/dawn/node/binding/GPUComputePipeline.h +++ b/src/dawn/node/binding/GPUComputePipeline.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUCOMPUTEPIPELINE_H_ #define SRC_DAWN_NODE_BINDING_GPUCOMPUTEPIPELINE_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUDevice.h b/src/dawn/node/binding/GPUDevice.h index 5936227..116161a 100644 --- a/src/dawn/node/binding/GPUDevice.h +++ b/src/dawn/node/binding/GPUDevice.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUDEVICE_H_ #define SRC_DAWN_NODE_BINDING_GPUDEVICE_H_ +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <string> -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/binding/AsyncRunner.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUPipelineLayout.h b/src/dawn/node/binding/GPUPipelineLayout.h index 8e2b064..3492f6c 100644 --- a/src/dawn/node/binding/GPUPipelineLayout.h +++ b/src/dawn/node/binding/GPUPipelineLayout.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUPIPELINELAYOUT_H_ #define SRC_DAWN_NODE_BINDING_GPUPIPELINELAYOUT_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUQuerySet.h b/src/dawn/node/binding/GPUQuerySet.h index f1906dc..4040bf0 100644 --- a/src/dawn/node/binding/GPUQuerySet.h +++ b/src/dawn/node/binding/GPUQuerySet.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUQUERYSET_H_ #define SRC_DAWN_NODE_BINDING_GPUQUERYSET_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUQueue.h b/src/dawn/node/binding/GPUQueue.h index 811eda1..bb81879 100644 --- a/src/dawn/node/binding/GPUQueue.h +++ b/src/dawn/node/binding/GPUQueue.h
@@ -28,12 +28,13 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUQUEUE_H_ #define SRC_DAWN_NODE_BINDING_GPUQUEUE_H_ +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <string> #include <vector> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/binding/AsyncRunner.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPURenderBundle.h b/src/dawn/node/binding/GPURenderBundle.h index 94e7d0c..6ee5914 100644 --- a/src/dawn/node/binding/GPURenderBundle.h +++ b/src/dawn/node/binding/GPURenderBundle.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPURENDERBUNDLE_H_ #define SRC_DAWN_NODE_BINDING_GPURENDERBUNDLE_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPURenderBundleEncoder.h b/src/dawn/node/binding/GPURenderBundleEncoder.h index 5d6d054..1a150d4 100644 --- a/src/dawn/node/binding/GPURenderBundleEncoder.h +++ b/src/dawn/node/binding/GPURenderBundleEncoder.h
@@ -28,11 +28,12 @@ #ifndef SRC_DAWN_NODE_BINDING_GPURENDERBUNDLEENCODER_H_ #define SRC_DAWN_NODE_BINDING_GPURENDERBUNDLEENCODER_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include <vector> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPURenderPassEncoder.h b/src/dawn/node/binding/GPURenderPassEncoder.h index 0413705..68c9d2b 100644 --- a/src/dawn/node/binding/GPURenderPassEncoder.h +++ b/src/dawn/node/binding/GPURenderPassEncoder.h
@@ -28,11 +28,12 @@ #ifndef SRC_DAWN_NODE_BINDING_GPURENDERPASSENCODER_H_ #define SRC_DAWN_NODE_BINDING_GPURENDERPASSENCODER_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include <vector> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPURenderPipeline.h b/src/dawn/node/binding/GPURenderPipeline.h index 19c43d9..51cad32 100644 --- a/src/dawn/node/binding/GPURenderPipeline.h +++ b/src/dawn/node/binding/GPURenderPipeline.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPURENDERPIPELINE_H_ #define SRC_DAWN_NODE_BINDING_GPURENDERPIPELINE_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUSampler.h b/src/dawn/node/binding/GPUSampler.h index de3933a..4a7eb85 100644 --- a/src/dawn/node/binding/GPUSampler.h +++ b/src/dawn/node/binding/GPUSampler.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUSAMPLER_H_ #define SRC_DAWN_NODE_BINDING_GPUSAMPLER_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUShaderModule.h b/src/dawn/node/binding/GPUShaderModule.h index 3715753..3ba4699 100644 --- a/src/dawn/node/binding/GPUShaderModule.h +++ b/src/dawn/node/binding/GPUShaderModule.h
@@ -28,11 +28,12 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUSHADERMODULE_H_ #define SRC_DAWN_NODE_BINDING_GPUSHADERMODULE_H_ +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/binding/AsyncRunner.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUSupportedFeatures.h b/src/dawn/node/binding/GPUSupportedFeatures.h index 1ab84be..417c4b3 100644 --- a/src/dawn/node/binding/GPUSupportedFeatures.h +++ b/src/dawn/node/binding/GPUSupportedFeatures.h
@@ -28,12 +28,12 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUSUPPORTEDFEATURES_H_ #define SRC_DAWN_NODE_BINDING_GPUSUPPORTEDFEATURES_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include <unordered_set> #include <vector> -#include "dawn/webgpu_cpp.h" - #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUSupportedLimits.h b/src/dawn/node/binding/GPUSupportedLimits.h index 9e51f40..451dd61 100644 --- a/src/dawn/node/binding/GPUSupportedLimits.h +++ b/src/dawn/node/binding/GPUSupportedLimits.h
@@ -28,9 +28,9 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUSUPPORTEDLIMITS_H_ #define SRC_DAWN_NODE_BINDING_GPUSUPPORTEDLIMITS_H_ -#include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" +#include <webgpu/webgpu_cpp.h> +#include "dawn/native/DawnNative.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUTexture.h b/src/dawn/node/binding/GPUTexture.h index f87f95a..43ca7ee 100644 --- a/src/dawn/node/binding/GPUTexture.h +++ b/src/dawn/node/binding/GPUTexture.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUTEXTURE_H_ #define SRC_DAWN_NODE_BINDING_GPUTEXTURE_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/GPUTextureView.h b/src/dawn/node/binding/GPUTextureView.h index 200504a..08fbc27 100644 --- a/src/dawn/node/binding/GPUTextureView.h +++ b/src/dawn/node/binding/GPUTextureView.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_GPUTEXTUREVIEW_H_ #define SRC_DAWN_NODE_BINDING_GPUTEXTUREVIEW_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/interop/NodeAPI.h" #include "src/dawn/node/interop/WebGPU.h"
diff --git a/src/dawn/node/binding/TogglesLoader.h b/src/dawn/node/binding/TogglesLoader.h index b075aa0..7f7d6a4 100644 --- a/src/dawn/node/binding/TogglesLoader.h +++ b/src/dawn/node/binding/TogglesLoader.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_NODE_BINDING_TOGGLESLOADER_H_ #define SRC_DAWN_NODE_BINDING_TOGGLESLOADER_H_ +#include <webgpu/webgpu_cpp.h> + #include <string> #include <vector> -#include "dawn/webgpu_cpp.h" #include "src/dawn/node/binding/Flags.h" namespace wgpu::binding {
diff --git a/src/dawn/platform/BUILD.gn b/src/dawn/platform/BUILD.gn index 62e9e3a..83df40d 100644 --- a/src/dawn/platform/BUILD.gn +++ b/src/dawn/platform/BUILD.gn
@@ -53,7 +53,7 @@ } public_deps = [ - # DawnPlatform.h has #include "dawn/webgpu.h" + # DawnPlatform.h has #include <webgpu/webgpu.h> "${dawn_root}/include/dawn:headers", "${dawn_root}/src/dawn/partition_alloc:raw_ptr", ]
diff --git a/src/dawn/samples/ManualSurfaceTest.cpp b/src/dawn/samples/ManualSurfaceTest.cpp index 4e686a6..3c35062 100644 --- a/src/dawn/samples/ManualSurfaceTest.cpp +++ b/src/dawn/samples/ManualSurfaceTest.cpp
@@ -77,6 +77,8 @@ // - Check OpenGL rendering with extra usages / depth buffer / MRT. // - Check with GLFW transparency on / off. +#include <webgpu/webgpu_cpp.h> + #include <algorithm> #include <iostream> #include <memory> @@ -93,7 +95,6 @@ #include "dawn/utils/ComboRenderPipelineDescriptor.h" #include "dawn/utils/CommandLineParser.h" #include "dawn/utils/WGPUHelpers.h" -#include "dawn/webgpu_cpp.h" #include "dawn/webgpu_cpp_print.h" #include "webgpu/webgpu_glfw.h"
diff --git a/src/dawn/samples/SampleUtils.h b/src/dawn/samples/SampleUtils.h index e62df39..44387cf 100644 --- a/src/dawn/samples/SampleUtils.h +++ b/src/dawn/samples/SampleUtils.h
@@ -32,7 +32,7 @@ #include "GLFW/glfw3.h" #endif // __EMSCRIPTEN__ -#include "dawn/webgpu_cpp.h" +#include <webgpu/webgpu_cpp.h> wgpu::TextureFormat GetPreferredSwapChainTextureFormat(); bool InitSample(int argc, const char** argv);
diff --git a/src/dawn/tests/AdapterTestConfig.cpp b/src/dawn/tests/AdapterTestConfig.cpp index b316ae1..04796ef 100644 --- a/src/dawn/tests/AdapterTestConfig.cpp +++ b/src/dawn/tests/AdapterTestConfig.cpp
@@ -27,13 +27,14 @@ #include "dawn/tests/AdapterTestConfig.h" +#include <webgpu/webgpu_cpp.h> + #include <initializer_list> #include <ostream> #include <string> #include <vector> #include "dawn/common/Assert.h" -#include "dawn/webgpu_cpp.h" BackendTestConfig::BackendTestConfig(wgpu::BackendType backendType, std::initializer_list<const char*> forceEnabledWorkarounds,
diff --git a/src/dawn/tests/AdapterTestConfig.h b/src/dawn/tests/AdapterTestConfig.h index 1919bff..44a2c2a 100644 --- a/src/dawn/tests/AdapterTestConfig.h +++ b/src/dawn/tests/AdapterTestConfig.h
@@ -29,14 +29,13 @@ #define SRC_DAWN_TESTS_ADAPTERTESTCONFIG_H_ #include <stdint.h> +#include <webgpu/webgpu_cpp.h> #include <initializer_list> #include <ostream> #include <string> #include <vector> -#include "dawn/webgpu_cpp.h" - struct BackendTestConfig { BackendTestConfig(wgpu::BackendType backendType, std::initializer_list<const char*> forceEnabledWorkarounds = {},
diff --git a/src/dawn/tests/DawnNativeTest.h b/src/dawn/tests/DawnNativeTest.h index 831315a..3d4840e 100644 --- a/src/dawn/tests/DawnNativeTest.h +++ b/src/dawn/tests/DawnNativeTest.h
@@ -28,12 +28,13 @@ #ifndef SRC_DAWN_TESTS_DAWNNATIVETEST_H_ #define SRC_DAWN_TESTS_DAWNNATIVETEST_H_ +#include <gtest/gtest.h> +#include <webgpu/webgpu_cpp.h> + #include <memory> #include "dawn/native/DawnNative.h" #include "dawn/native/ErrorData.h" -#include "dawn/webgpu_cpp.h" -#include "gtest/gtest.h" namespace dawn::native {
diff --git a/src/dawn/tests/DawnTest.h b/src/dawn/tests/DawnTest.h index b39fd90..416b355 100644 --- a/src/dawn/tests/DawnTest.h +++ b/src/dawn/tests/DawnTest.h
@@ -28,6 +28,10 @@ #ifndef SRC_DAWN_TESTS_DAWNTEST_H_ #define SRC_DAWN_TESTS_DAWNTEST_H_ +#include <gmock/gmock.h> +#include <gtest/gtest.h> +#include <webgpu/webgpu_cpp.h> + #include <atomic> #include <memory> #include <queue> @@ -49,10 +53,7 @@ #include "dawn/tests/ToggleParser.h" #include "dawn/utils/TestUtils.h" #include "dawn/utils/TextureUtils.h" -#include "dawn/webgpu_cpp.h" #include "dawn/webgpu_cpp_print.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "partition_alloc/pointers/raw_ptr.h" // Getting data back from Dawn is done in an async manners so all expectations are "deferred"
diff --git a/src/dawn/tests/end2end/AdapterCreationTests.cpp b/src/dawn/tests/end2end/AdapterCreationTests.cpp index d75cd01..3c8125d 100644 --- a/src/dawn/tests/end2end/AdapterCreationTests.cpp +++ b/src/dawn/tests/end2end/AdapterCreationTests.cpp
@@ -25,6 +25,8 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <optional> #include <string> @@ -35,7 +37,6 @@ #include "dawn/native/DawnNative.h" #include "dawn/tests/DawnTest.h" #include "dawn/tests/MockCallback.h" -#include "dawn/webgpu_cpp.h" #include "gtest/gtest.h" namespace dawn {
diff --git a/src/dawn/tests/end2end/AdapterEnumerationTests.cpp b/src/dawn/tests/end2end/AdapterEnumerationTests.cpp index a811394..1c297f0 100644 --- a/src/dawn/tests/end2end/AdapterEnumerationTests.cpp +++ b/src/dawn/tests/end2end/AdapterEnumerationTests.cpp
@@ -25,13 +25,14 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <utility> #include "dawn/common/GPUInfo.h" #include "dawn/dawn_proc.h" #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" #if defined(DAWN_ENABLE_BACKEND_VULKAN) #include "dawn/native/VulkanBackend.h"
diff --git a/src/dawn/tests/end2end/EventTests.cpp b/src/dawn/tests/end2end/EventTests.cpp index 0395960..81eb05d 100644 --- a/src/dawn/tests/end2end/EventTests.cpp +++ b/src/dawn/tests/end2end/EventTests.cpp
@@ -25,6 +25,9 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <gmock/gmock.h> +#include <webgpu/webgpu.h> + #include <atomic> #include <cstdint> #include <utility> @@ -32,8 +35,6 @@ #include "dawn/common/FutureUtils.h" #include "dawn/tests/DawnTest.h" -#include "dawn/webgpu.h" -#include "gmock/gmock.h" namespace dawn { namespace {
diff --git a/src/dawn/tests/unittests/DefaultTests.cpp b/src/dawn/tests/unittests/DefaultTests.cpp index 422dd24..3316ce6 100644 --- a/src/dawn/tests/unittests/DefaultTests.cpp +++ b/src/dawn/tests/unittests/DefaultTests.cpp
@@ -25,9 +25,9 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "dawn/webgpu.h" -#include "dawn/webgpu_cpp.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> +#include <webgpu/webgpu.h> +#include <webgpu/webgpu_cpp.h> // Test that the C init structs match the C++ default values TEST(DefaultTests, CMatchesCpp) {
diff --git a/src/dawn/tests/unittests/EnumClassBitmasksTests.cpp b/src/dawn/tests/unittests/EnumClassBitmasksTests.cpp index 01a4cda..7a96d38 100644 --- a/src/dawn/tests/unittests/EnumClassBitmasksTests.cpp +++ b/src/dawn/tests/unittests/EnumClassBitmasksTests.cpp
@@ -25,9 +25,8 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "gtest/gtest.h" - -#include "webgpu/webgpu_enum_class_bitmasks.h" +#include <gtest/gtest.h> +#include <webgpu/webgpu_enum_class_bitmasks.h> // This shows an example of how to set up a bitmask in a namespace other than // wgpu. The namespace can be either named or anonymous. In dawn, it is usually
diff --git a/src/dawn/tests/unittests/MathTests.cpp b/src/dawn/tests/unittests/MathTests.cpp index bc78b67..5ae7fa7 100644 --- a/src/dawn/tests/unittests/MathTests.cpp +++ b/src/dawn/tests/unittests/MathTests.cpp
@@ -25,14 +25,15 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <gtest/gtest.h> +#include <webgpu/webgpu_cpp.h> +#include <webgpu/webgpu_enum_class_bitmasks.h> + #include <cmath> #include <limits> #include <vector> #include "dawn/common/Math.h" -#include "dawn/webgpu_cpp.h" -#include "gtest/gtest.h" -#include "webgpu/webgpu_enum_class_bitmasks.h" namespace wgpu {
diff --git a/src/dawn/tests/unittests/ObjectBaseTests.cpp b/src/dawn/tests/unittests/ObjectBaseTests.cpp index b9dd753..a6482ae 100644 --- a/src/dawn/tests/unittests/ObjectBaseTests.cpp +++ b/src/dawn/tests/unittests/ObjectBaseTests.cpp
@@ -25,10 +25,10 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <utility> +#include <gtest/gtest.h> +#include <webgpu/webgpu_cpp.h> -#include "dawn/webgpu_cpp.h" -#include "gtest/gtest.h" +#include <utility> class Object : public wgpu::ObjectBase<Object, int*> { public:
diff --git a/src/dawn/tests/unittests/PerThreadProcTests.cpp b/src/dawn/tests/unittests/PerThreadProcTests.cpp index 5478480..f53b8e3 100644 --- a/src/dawn/tests/unittests/PerThreadProcTests.cpp +++ b/src/dawn/tests/unittests/PerThreadProcTests.cpp
@@ -25,16 +25,16 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <gtest/gtest.h> +#include <webgpu/webgpu_cpp.h> + #include <atomic> #include <thread> -#include "gtest/gtest.h" - #include "dawn/dawn_thread_dispatch_proc.h" #include "dawn/native/DawnNative.h" #include "dawn/native/Instance.h" #include "dawn/native/null/DeviceNull.h" -#include "dawn/webgpu_cpp.h" namespace dawn { namespace {
diff --git a/src/dawn/tests/unittests/native/AllowedErrorTests.cpp b/src/dawn/tests/unittests/native/AllowedErrorTests.cpp index 2230816..2a75326 100644 --- a/src/dawn/tests/unittests/native/AllowedErrorTests.cpp +++ b/src/dawn/tests/unittests/native/AllowedErrorTests.cpp
@@ -26,13 +26,13 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <gtest/gtest.h> +#include <webgpu/webgpu_cpp.h> #include <string_view> #include <utility> #include "dawn/native/ChainUtils.h" #include "dawn/tests/MockCallback.h" -#include "dawn/webgpu_cpp.h" #include "mocks/BufferMock.h" #include "mocks/ComputePipelineMock.h" #include "mocks/DawnMockTest.h"
diff --git a/src/dawn/tests/unittests/native/DestroyObjectTests.cpp b/src/dawn/tests/unittests/native/DestroyObjectTests.cpp index 361a613..a024878 100644 --- a/src/dawn/tests/unittests/native/DestroyObjectTests.cpp +++ b/src/dawn/tests/unittests/native/DestroyObjectTests.cpp
@@ -26,6 +26,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <gtest/gtest.h> +#include <webgpu/webgpu_cpp.h> #include <utility> #include <vector> @@ -37,7 +38,6 @@ #include "dawn/tests/MockCallback.h" #include "dawn/utils/ComboRenderPipelineDescriptor.h" #include "dawn/utils/WGPUHelpers.h" -#include "dawn/webgpu_cpp.h" #include "mocks/BindGroupLayoutMock.h" #include "mocks/BindGroupMock.h" #include "mocks/BufferMock.h"
diff --git a/src/dawn/tests/unittests/native/mocks/DawnMockTest.h b/src/dawn/tests/unittests/native/mocks/DawnMockTest.h index 3b8ff60..e5ffdb0 100644 --- a/src/dawn/tests/unittests/native/mocks/DawnMockTest.h +++ b/src/dawn/tests/unittests/native/mocks/DawnMockTest.h
@@ -26,9 +26,9 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <gtest/gtest.h> +#include <webgpu/webgpu_cpp.h> #include "dawn/tests/unittests/native/mocks/DeviceMock.h" -#include "dawn/webgpu_cpp.h" #include "partition_alloc/pointers/raw_ptr.h" namespace dawn::native {
diff --git a/src/dawn/tests/unittests/validation/ValidationTest.cpp b/src/dawn/tests/unittests/validation/ValidationTest.cpp index cdb4901..3ad9edb 100644 --- a/src/dawn/tests/unittests/validation/ValidationTest.cpp +++ b/src/dawn/tests/unittests/validation/ValidationTest.cpp
@@ -25,6 +25,8 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <webgpu/webgpu.h> + #include <algorithm> #include <unordered_set> #include <utility> @@ -39,7 +41,6 @@ #include "dawn/tests/ToggleParser.h" #include "dawn/tests/unittests/validation/ValidationTest.h" #include "dawn/utils/WireHelper.h" -#include "dawn/webgpu.h" namespace {
diff --git a/src/dawn/tests/unittests/validation/ValidationTest.h b/src/dawn/tests/unittests/validation/ValidationTest.h index 9d06e6d..f59330f 100644 --- a/src/dawn/tests/unittests/validation/ValidationTest.h +++ b/src/dawn/tests/unittests/validation/ValidationTest.h
@@ -28,6 +28,10 @@ #ifndef SRC_DAWN_TESTS_UNITTESTS_VALIDATION_VALIDATIONTEST_H_ #define SRC_DAWN_TESTS_UNITTESTS_VALIDATION_VALIDATIONTEST_H_ +#include <gmock/gmock.h> +#include <gtest/gtest.h> +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <string> #include <vector> @@ -35,9 +39,6 @@ #include "dawn/common/Log.h" #include "dawn/native/BindGroupLayout.h" #include "dawn/native/DawnNative.h" -#include "dawn/webgpu_cpp.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" // Argument helpers to allow macro overriding. #define UNIMPLEMENTED_MACRO(...) DAWN_UNREACHABLE()
diff --git a/src/dawn/tests/unittests/wire/WireDeviceLifetimeTests.cpp b/src/dawn/tests/unittests/wire/WireDeviceLifetimeTests.cpp index 8b9c053..59a2b85 100644 --- a/src/dawn/tests/unittests/wire/WireDeviceLifetimeTests.cpp +++ b/src/dawn/tests/unittests/wire/WireDeviceLifetimeTests.cpp
@@ -25,13 +25,14 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <gtest/gtest.h> +#include <webgpu/webgpu.h> + #include <memory> #include <utility> #include "dawn/native/Instance.h" #include "dawn/utils/WireHelper.h" -#include "dawn/webgpu.h" -#include "gtest/gtest.h" namespace dawn { namespace {
diff --git a/src/dawn/tests/white_box/SharedTextureMemoryTests_android.cpp b/src/dawn/tests/white_box/SharedTextureMemoryTests_android.cpp index 93e146f..cb1706c 100644 --- a/src/dawn/tests/white_box/SharedTextureMemoryTests_android.cpp +++ b/src/dawn/tests/white_box/SharedTextureMemoryTests_android.cpp
@@ -26,6 +26,8 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <android/hardware_buffer.h> +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <string> #include <utility> @@ -36,7 +38,6 @@ #include "dawn/native/vulkan/VulkanError.h" #include "dawn/tests/white_box/SharedTextureMemoryTests.h" #include "dawn/utils/WGPUHelpers.h" -#include "dawn/webgpu_cpp.h" namespace dawn { namespace {
diff --git a/src/dawn/tests/white_box/SharedTextureMemoryTests_apple.mm b/src/dawn/tests/white_box/SharedTextureMemoryTests_apple.mm index fa7cdcf..89f25e5 100644 --- a/src/dawn/tests/white_box/SharedTextureMemoryTests_apple.mm +++ b/src/dawn/tests/white_box/SharedTextureMemoryTests_apple.mm
@@ -28,13 +28,13 @@ #include <CoreFoundation/CoreFoundation.h> #include <CoreVideo/CVPixelBuffer.h> #include <IOSurface/IOSurface.h> +#include <webgpu/webgpu_cpp.h> #import <Metal/Metal.h> #include "dawn/common/CoreFoundationRef.h" #include "dawn/common/NSRef.h" #include "dawn/tests/white_box/SharedTextureMemoryTests.h" -#include "dawn/webgpu_cpp.h" namespace dawn { namespace {
diff --git a/src/dawn/tests/white_box/SharedTextureMemoryTests_dmabuf.cpp b/src/dawn/tests/white_box/SharedTextureMemoryTests_dmabuf.cpp index 9f69fe0..1f165eb 100644 --- a/src/dawn/tests/white_box/SharedTextureMemoryTests_dmabuf.cpp +++ b/src/dawn/tests/white_box/SharedTextureMemoryTests_dmabuf.cpp
@@ -29,13 +29,14 @@ #include <gbm.h> #include <unistd.h> #include <vulkan/vulkan.h> +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <string> #include <utility> #include <vector> #include "dawn/tests/white_box/SharedTextureMemoryTests.h" -#include "dawn/webgpu_cpp.h" namespace dawn { namespace {
diff --git a/src/dawn/tests/white_box/SharedTextureMemoryTests_opaquefd.cpp b/src/dawn/tests/white_box/SharedTextureMemoryTests_opaquefd.cpp index 9fa5f0d..9b03b0c 100644 --- a/src/dawn/tests/white_box/SharedTextureMemoryTests_opaquefd.cpp +++ b/src/dawn/tests/white_box/SharedTextureMemoryTests_opaquefd.cpp
@@ -25,6 +25,8 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <string> #include <utility> @@ -36,7 +38,6 @@ #include "dawn/native/vulkan/ResourceMemoryAllocatorVk.h" #include "dawn/native/vulkan/UtilsVulkan.h" #include "dawn/tests/white_box/SharedTextureMemoryTests.h" -#include "dawn/webgpu_cpp.h" namespace dawn::native::vulkan { namespace {
diff --git a/src/dawn/tests/white_box/SharedTextureMemoryTests_win.cpp b/src/dawn/tests/white_box/SharedTextureMemoryTests_win.cpp index 81dbede..8cf9fd0 100644 --- a/src/dawn/tests/white_box/SharedTextureMemoryTests_win.cpp +++ b/src/dawn/tests/white_box/SharedTextureMemoryTests_win.cpp
@@ -29,7 +29,9 @@ #include <d3d11_4.h> #include <d3d12.h> #include <dxgi1_4.h> +#include <webgpu/webgpu_cpp.h> #include <wrl/client.h> + #include <string> #include <utility> #include <vector> @@ -37,7 +39,6 @@ #include "dawn/native/D3D11Backend.h" #include "dawn/native/D3DBackend.h" #include "dawn/tests/white_box/SharedTextureMemoryTests.h" -#include "dawn/webgpu_cpp.h" namespace dawn { namespace {
diff --git a/src/dawn/tests/white_box/VulkanImageWrappingTests.h b/src/dawn/tests/white_box/VulkanImageWrappingTests.h index f6eef10..56a043d 100644 --- a/src/dawn/tests/white_box/VulkanImageWrappingTests.h +++ b/src/dawn/tests/white_box/VulkanImageWrappingTests.h
@@ -28,6 +28,8 @@ #ifndef SRC_DAWN_TESTS_WHITE_BOX_VULKANIMAGEWRAPPINGTESTS_H_ #define SRC_DAWN_TESTS_WHITE_BOX_VULKANIMAGEWRAPPINGTESTS_H_ +#include <webgpu/webgpu_cpp.h> + #include <memory> #include <vector> @@ -37,7 +39,6 @@ #include "dawn/common/NonCopyable.h" #include "dawn/native/VulkanBackend.h" -#include "dawn/webgpu_cpp.h" namespace dawn::native::vulkan {
diff --git a/src/dawn/utils/ComboRenderBundleEncoderDescriptor.h b/src/dawn/utils/ComboRenderBundleEncoderDescriptor.h index ec8ae5d..52e59f6d 100644 --- a/src/dawn/utils/ComboRenderBundleEncoderDescriptor.h +++ b/src/dawn/utils/ComboRenderBundleEncoderDescriptor.h
@@ -28,10 +28,11 @@ #ifndef SRC_DAWN_UTILS_COMBORENDERBUNDLEENCODERDESCRIPTOR_H_ #define SRC_DAWN_UTILS_COMBORENDERBUNDLEENCODERDESCRIPTOR_H_ +#include <webgpu/webgpu_cpp.h> + #include <array> #include "dawn/common/Constants.h" -#include "dawn/webgpu_cpp.h" namespace dawn::utils {
diff --git a/src/dawn/utils/ComboRenderPipelineDescriptor.h b/src/dawn/utils/ComboRenderPipelineDescriptor.h index 2f9f322..121a561 100644 --- a/src/dawn/utils/ComboRenderPipelineDescriptor.h +++ b/src/dawn/utils/ComboRenderPipelineDescriptor.h
@@ -28,11 +28,12 @@ #ifndef SRC_DAWN_UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_ #define SRC_DAWN_UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_ +#include <webgpu/webgpu_cpp.h> + #include <array> #include <vector> #include "dawn/common/Constants.h" -#include "dawn/webgpu_cpp.h" namespace dawn::utils {
diff --git a/src/dawn/utils/TestUtils.h b/src/dawn/utils/TestUtils.h index a166964..cf453b4 100644 --- a/src/dawn/utils/TestUtils.h +++ b/src/dawn/utils/TestUtils.h
@@ -28,11 +28,11 @@ #ifndef SRC_DAWN_UTILS_TESTUTILS_H_ #define SRC_DAWN_UTILS_TESTUTILS_H_ +#include <webgpu/webgpu_cpp.h> + #include <functional> #include <ostream> -#include "dawn/webgpu_cpp.h" - namespace dawn::utils { struct RGBA8 {
diff --git a/src/dawn/utils/TextureUtils.h b/src/dawn/utils/TextureUtils.h index 4f8fd6a..b6a7715 100644 --- a/src/dawn/utils/TextureUtils.h +++ b/src/dawn/utils/TextureUtils.h
@@ -28,9 +28,9 @@ #ifndef SRC_DAWN_UTILS_TEXTUREUTILS_H_ #define SRC_DAWN_UTILS_TEXTUREUTILS_H_ -#include <array> +#include <webgpu/webgpu_cpp.h> -#include "dawn/webgpu_cpp.h" +#include <array> #include "dawn/common/Assert.h"
diff --git a/src/dawn/utils/WGPUHelpers.h b/src/dawn/utils/WGPUHelpers.h index 5ffb567..1208825 100644 --- a/src/dawn/utils/WGPUHelpers.h +++ b/src/dawn/utils/WGPUHelpers.h
@@ -28,6 +28,8 @@ #ifndef SRC_DAWN_UTILS_WGPUHELPERS_H_ #define SRC_DAWN_UTILS_WGPUHELPERS_H_ +#include <webgpu/webgpu_cpp.h> + #include <array> #include <initializer_list> #include <string> @@ -35,7 +37,6 @@ #include "dawn/common/Constants.h" #include "dawn/utils/TextureUtils.h" -#include "dawn/webgpu_cpp.h" namespace dawn::utils {
diff --git a/src/dawn/utils/WireHelper.h b/src/dawn/utils/WireHelper.h index 61b5903..8ef80f6 100644 --- a/src/dawn/utils/WireHelper.h +++ b/src/dawn/utils/WireHelper.h
@@ -28,12 +28,12 @@ #ifndef SRC_DAWN_UTILS_WIREHELPER_H_ #define SRC_DAWN_UTILS_WIREHELPER_H_ +#include <webgpu/webgpu_cpp.h> + #include <cstdint> #include <memory> #include <utility> -#include "dawn/webgpu_cpp.h" - struct DawnProcTable; namespace dawn::native {
diff --git a/src/dawn/wire/SupportedFeatures.h b/src/dawn/wire/SupportedFeatures.h index 8d7b41b..5866e8d 100644 --- a/src/dawn/wire/SupportedFeatures.h +++ b/src/dawn/wire/SupportedFeatures.h
@@ -28,7 +28,7 @@ #ifndef SRC_DAWN_WIRE_SUPPORTEDFEATURES_H_ #define SRC_DAWN_WIRE_SUPPORTEDFEATURES_H_ -#include "dawn/webgpu.h" +#include <webgpu/webgpu.h> namespace dawn::wire {
diff --git a/src/dawn/wire/client/Buffer.h b/src/dawn/wire/client/Buffer.h index d9c880a..2abb17c 100644 --- a/src/dawn/wire/client/Buffer.h +++ b/src/dawn/wire/client/Buffer.h
@@ -28,13 +28,14 @@ #ifndef SRC_DAWN_WIRE_CLIENT_BUFFER_H_ #define SRC_DAWN_WIRE_CLIENT_BUFFER_H_ +#include <webgpu/webgpu.h> + #include <memory> #include <optional> #include "dawn/common/FutureUtils.h" #include "dawn/common/Ref.h" #include "dawn/common/RefCounted.h" -#include "dawn/webgpu.h" #include "dawn/wire/WireClient.h" #include "dawn/wire/client/ObjectBase.h" #include "partition_alloc/pointers/raw_ptr.h"
diff --git a/src/dawn/wire/client/Client.h b/src/dawn/wire/client/Client.h index d97334d..18823e3 100644 --- a/src/dawn/wire/client/Client.h +++ b/src/dawn/wire/client/Client.h
@@ -28,13 +28,14 @@ #ifndef SRC_DAWN_WIRE_CLIENT_CLIENT_H_ #define SRC_DAWN_WIRE_CLIENT_CLIENT_H_ +#include <webgpu/webgpu.h> + #include <memory> #include <utility> #include "absl/container/flat_hash_map.h" #include "dawn/common/LinkedList.h" #include "dawn/common/NonCopyable.h" -#include "dawn/webgpu.h" #include "dawn/wire/ChunkedCommandSerializer.h" #include "dawn/wire/Wire.h" #include "dawn/wire/WireClient.h"
diff --git a/src/dawn/wire/client/Device.h b/src/dawn/wire/client/Device.h index 141e289..4106bb0 100644 --- a/src/dawn/wire/client/Device.h +++ b/src/dawn/wire/client/Device.h
@@ -28,11 +28,12 @@ #ifndef SRC_DAWN_WIRE_CLIENT_DEVICE_H_ #define SRC_DAWN_WIRE_CLIENT_DEVICE_H_ +#include <webgpu/webgpu.h> + #include <memory> #include "dawn/common/LinkedList.h" #include "dawn/common/RefCountedWithExternalCount.h" -#include "dawn/webgpu.h" #include "dawn/wire/WireCmd_autogen.h" #include "dawn/wire/client/ApiObjects_autogen.h" #include "dawn/wire/client/LimitsAndFeatures.h"
diff --git a/src/dawn/wire/client/EventManager.h b/src/dawn/wire/client/EventManager.h index ff5663e..9ba5510 100644 --- a/src/dawn/wire/client/EventManager.h +++ b/src/dawn/wire/client/EventManager.h
@@ -28,6 +28,8 @@ #ifndef SRC_DAWN_WIRE_CLIENT_EVENTMANAGER_H_ #define SRC_DAWN_WIRE_CLIENT_EVENTMANAGER_H_ +#include <webgpu/webgpu.h> + #include <cstddef> #include <functional> #include <map> @@ -37,7 +39,6 @@ #include "dawn/common/FutureUtils.h" #include "dawn/common/MutexProtected.h" #include "dawn/common/NonCopyable.h" -#include "dawn/webgpu.h" #include "dawn/wire/WireResult.h" #include "partition_alloc/pointers/raw_ptr.h"
diff --git a/src/dawn/wire/client/LimitsAndFeatures.h b/src/dawn/wire/client/LimitsAndFeatures.h index bb2ee95..b29ffd0 100644 --- a/src/dawn/wire/client/LimitsAndFeatures.h +++ b/src/dawn/wire/client/LimitsAndFeatures.h
@@ -28,8 +28,9 @@ #ifndef SRC_DAWN_WIRE_CLIENT_LIMITSANDFEATURES_H_ #define SRC_DAWN_WIRE_CLIENT_LIMITSANDFEATURES_H_ +#include <webgpu/webgpu.h> + #include "absl/container/flat_hash_set.h" -#include "dawn/webgpu.h" namespace dawn::wire::client {
diff --git a/src/dawn/wire/client/ObjectBase.h b/src/dawn/wire/client/ObjectBase.h index 1a358b7..957e0dd 100644 --- a/src/dawn/wire/client/ObjectBase.h +++ b/src/dawn/wire/client/ObjectBase.h
@@ -28,7 +28,8 @@ #ifndef SRC_DAWN_WIRE_CLIENT_OBJECTBASE_H_ #define SRC_DAWN_WIRE_CLIENT_OBJECTBASE_H_ -#include "dawn/webgpu.h" +#include <webgpu/webgpu.h> + #include "partition_alloc/pointers/raw_ptr.h" #include "dawn/common/Ref.h"
diff --git a/src/dawn/wire/client/QuerySet.h b/src/dawn/wire/client/QuerySet.h index 1fe7dfa..100ac48 100644 --- a/src/dawn/wire/client/QuerySet.h +++ b/src/dawn/wire/client/QuerySet.h
@@ -28,7 +28,7 @@ #ifndef SRC_DAWN_WIRE_CLIENT_QUERYSET_H_ #define SRC_DAWN_WIRE_CLIENT_QUERYSET_H_ -#include "dawn/webgpu.h" +#include <webgpu/webgpu.h> #include "dawn/wire/client/ObjectBase.h"
diff --git a/src/dawn/wire/client/Queue.h b/src/dawn/wire/client/Queue.h index 0566f08..bec29d7 100644 --- a/src/dawn/wire/client/Queue.h +++ b/src/dawn/wire/client/Queue.h
@@ -28,7 +28,7 @@ #ifndef SRC_DAWN_WIRE_CLIENT_QUEUE_H_ #define SRC_DAWN_WIRE_CLIENT_QUEUE_H_ -#include "dawn/webgpu.h" +#include <webgpu/webgpu.h> #include "dawn/wire/WireClient.h" #include "dawn/wire/client/ObjectBase.h"
diff --git a/src/dawn/wire/client/ShaderModule.h b/src/dawn/wire/client/ShaderModule.h index c1432fc..d0558f6 100644 --- a/src/dawn/wire/client/ShaderModule.h +++ b/src/dawn/wire/client/ShaderModule.h
@@ -28,12 +28,12 @@ #ifndef SRC_DAWN_WIRE_CLIENT_SHADERMODULE_H_ #define SRC_DAWN_WIRE_CLIENT_SHADERMODULE_H_ +#include <webgpu/webgpu.h> + #include <optional> #include <string> #include <vector> -#include "dawn/webgpu.h" - #include "dawn/wire/client/ObjectBase.h" namespace dawn::wire::client {
diff --git a/src/dawn/wire/client/Surface.h b/src/dawn/wire/client/Surface.h index c6d5ccd..bf4693a 100644 --- a/src/dawn/wire/client/Surface.h +++ b/src/dawn/wire/client/Surface.h
@@ -28,9 +28,10 @@ #ifndef SRC_DAWN_WIRE_CLIENT_SURFACE_H_ #define SRC_DAWN_WIRE_CLIENT_SURFACE_H_ +#include <webgpu/webgpu.h> + #include <vector> -#include "dawn/webgpu.h" #include "dawn/wire/client/ObjectBase.h" namespace dawn::wire::client {
diff --git a/src/dawn/wire/client/SwapChain.h b/src/dawn/wire/client/SwapChain.h index 770c223..eae3741 100644 --- a/src/dawn/wire/client/SwapChain.h +++ b/src/dawn/wire/client/SwapChain.h
@@ -28,7 +28,7 @@ #ifndef SRC_DAWN_WIRE_CLIENT_SWAPCHAIN_H_ #define SRC_DAWN_WIRE_CLIENT_SWAPCHAIN_H_ -#include "dawn/webgpu.h" +#include <webgpu/webgpu.h> #include "dawn/wire/client/ObjectBase.h"
diff --git a/src/dawn/wire/client/Texture.h b/src/dawn/wire/client/Texture.h index 2271b0b..5b76a54 100644 --- a/src/dawn/wire/client/Texture.h +++ b/src/dawn/wire/client/Texture.h
@@ -28,7 +28,7 @@ #ifndef SRC_DAWN_WIRE_CLIENT_TEXTURE_H_ #define SRC_DAWN_WIRE_CLIENT_TEXTURE_H_ -#include "dawn/webgpu.h" +#include <webgpu/webgpu.h> #include "dawn/wire/client/ObjectBase.h"