Convert all dawn includes to use non-system include syntax.

This CL changes several includes which were using the system include syntax to the local syntax. This causes GN check to verify that the headers are specified correctly in the dependencies. Two missing dependencies are added to the BUILD.gn file for the Dawn tests. Bug: dawn:1373 Change-Id: I7afd5ab48f4f2e2ddaf1839058c6bbeec2b97fd0 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86940 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Dan Sinclair <dsinclair@chromium.org> Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
2025-12-09 21:47:47 +00:00 · 2022-04-19 14:24:04 +00:00
parent 9aa4b11281
commit d0fb4a36ac
57 changed files with 74 additions and 73 deletions
--- a/src/dawn/native/d3d12/D3D11on12Util.cpp
+++ b/src/dawn/native/d3d12/D3D11on12Util.cpp
@@ -22,7 +22,7 @@
 #include "dawn/native/d3d12/D3D12Error.h"
 #include "dawn/native/d3d12/DeviceD3D12.h"

-#include <dawn/native/D3D12Backend.h>
+#include "dawn/native/D3D12Backend.h"

 namespace dawn::native::d3d12 {

--- a/src/dawn/native/d3d12/D3D11on12Util.h
+++ b/src/dawn/native/d3d12/D3D11on12Util.h
@@ -19,9 +19,9 @@
 #include "dawn/native/Error.h"
 #include "dawn/native/d3d12/d3d12_platform.h"

-#include <dawn/native/DawnNative.h>
 #include <memory>
 #include <unordered_set>
+#include "dawn/native/DawnNative.h"

 struct ID3D11On12Device;
 struct IDXGIKeyedMutex;
--- a/src/dawn/native/d3d12/SwapChainD3D12.cpp
+++ b/src/dawn/native/d3d12/SwapChainD3D12.cpp
@@ -19,7 +19,7 @@
 #include "dawn/native/d3d12/DeviceD3D12.h"
 #include "dawn/native/d3d12/TextureD3D12.h"

-#include <dawn/dawn_wsi.h>
+#include "dawn/dawn_wsi.h"

 #include <windows.ui.xaml.media.dxinterop.h>

--- a/src/dawn/native/dawn_platform.h
+++ b/src/dawn/native/dawn_platform.h
@@ -16,9 +16,9 @@
 #define SRC_DAWN_NATIVE_DAWN_PLATFORM_H_

 // Use webgpu_cpp to have the enum and bitfield definitions
-#include <dawn/webgpu_cpp.h>
+#include "dawn/webgpu_cpp.h"

-#include <dawn/native/dawn_platform_autogen.h>
+#include "dawn/native/dawn_platform_autogen.h"

 namespace dawn::native {

--- a/src/dawn/native/metal/SwapChainMTL.mm
+++ b/src/dawn/native/metal/SwapChainMTL.mm
@@ -18,7 +18,7 @@
 #include "dawn/native/metal/DeviceMTL.h"
 #include "dawn/native/metal/TextureMTL.h"

-#include <dawn/dawn_wsi.h>
+#include "dawn/dawn_wsi.h"

 #import <QuartzCore/CAMetalLayer.h>

--- a/src/dawn/native/opengl/SwapChainGL.cpp
+++ b/src/dawn/native/opengl/SwapChainGL.cpp
@@ -18,7 +18,7 @@
 #include "dawn/native/opengl/Forward.h"
 #include "dawn/native/opengl/TextureGL.h"

-#include <dawn/dawn_wsi.h>
+#include "dawn/dawn_wsi.h"

 namespace dawn::native::opengl {

--- a/src/dawn/native/utils/WGPUHelpers.h
+++ b/src/dawn/native/utils/WGPUHelpers.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_NATIVE_UTILS_WGPUHELPERS_H_
 #define SRC_DAWN_NATIVE_UTILS_WGPUHELPERS_H_

-#include <dawn/native/dawn_platform.h>
+#include "dawn/native/dawn_platform.h"

 #include <array>
 #include <initializer_list>
--- a/src/dawn/platform/BUILD.gn
+++ b/src/dawn/platform/BUILD.gn
@@ -35,7 +35,7 @@ dawn_component("platform") {
  deps = [ "${dawn_root}/src/dawn/common" ]

  public_deps = [
-    # DawnPlatform.h has #include <dawn/webgpu.h>
+    # DawnPlatform.h has #include "dawn/webgpu.h"
    "${dawn_root}/include/dawn:headers",
  ]
 }
--- a/src/dawn/samples/ManualSwapChainTest.cpp
+++ b/src/dawn/samples/ManualSwapChainTest.cpp
@@ -58,10 +58,10 @@
 #include "dawn/utils/ScopedAutoreleasePool.h"
 #include "dawn/utils/WGPUHelpers.h"

-#include <dawn/dawn_proc.h>
-#include <dawn/native/DawnNative.h>
-#include <dawn/webgpu_cpp.h>
 #include "GLFW/glfw3.h"
+#include "dawn/dawn_proc.h"
+#include "dawn/native/DawnNative.h"
+#include "dawn/webgpu_cpp.h"

 #include <memory>
 #include <unordered_map>
--- a/src/dawn/samples/SampleUtils.h
+++ b/src/dawn/samples/SampleUtils.h
@@ -15,8 +15,8 @@
 #ifndef SRC_DAWN_SAMPLES_SAMPLEUTILS_H_
 #define SRC_DAWN_SAMPLES_SAMPLEUTILS_H_

-#include <dawn/dawn_wsi.h>
-#include <dawn/webgpu_cpp.h>
+#include "dawn/dawn_wsi.h"
+#include "dawn/webgpu_cpp.h"

 bool InitSample(int argc, const char** argv);
 void DoFlush();
--- a/src/dawn/tests/BUILD.gn
+++ b/src/dawn/tests/BUILD.gn
@@ -345,6 +345,7 @@ source_set("end2end_tests_sources") {

    # Statically linked because the end2end white_box tests use Dawn internals.
    "${dawn_root}/src/dawn/native:static",
+    "${dawn_root}/src/dawn/platform:platform",
    "${dawn_root}/src/dawn/utils",
    "${dawn_root}/src/dawn/wire",
  ]
@@ -572,6 +573,7 @@ dawn_test("dawn_end2end_tests") {
    "${dawn_root}/src/dawn:proc",
    "${dawn_root}/src/dawn/common",
    "${dawn_root}/src/dawn/native:static",
+    "${dawn_root}/src/dawn/platform:platform",
    "${dawn_root}/src/dawn/utils",
    "${dawn_root}/src/dawn/wire",
  ]
--- a/src/dawn/tests/DawnTest.h
+++ b/src/dawn/tests/DawnTest.h
@@ -27,9 +27,9 @@
 #include "dawn/webgpu_cpp.h"
 #include "dawn/webgpu_cpp_print.h"

-#include <dawn/platform/DawnPlatform.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include "dawn/platform/DawnPlatform.h"

 #include <memory>
 #include <unordered_map>
--- a/src/dawn/utils/ComboRenderBundleEncoderDescriptor.h
+++ b/src/dawn/utils/ComboRenderBundleEncoderDescriptor.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_UTILS_COMBORENDERBUNDLEENCODERDESCRIPTOR_H_
 #define SRC_DAWN_UTILS_COMBORENDERBUNDLEENCODERDESCRIPTOR_H_

-#include <dawn/webgpu_cpp.h>
+#include "dawn/webgpu_cpp.h"

 #include "dawn/common/Constants.h"

--- a/src/dawn/utils/ComboRenderPipelineDescriptor.h
+++ b/src/dawn/utils/ComboRenderPipelineDescriptor.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
 #define SRC_DAWN_UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_

-#include <dawn/webgpu_cpp.h>
+#include "dawn/webgpu_cpp.h"

 #include "dawn/common/Constants.h"

--- a/src/dawn/utils/TestUtils.h
+++ b/src/dawn/utils/TestUtils.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_UTILS_TESTUTILS_H_
 #define SRC_DAWN_UTILS_TESTUTILS_H_

-#include <dawn/webgpu_cpp.h>
+#include "dawn/webgpu_cpp.h"

 namespace utils {

--- a/src/dawn/utils/TextureUtils.h
+++ b/src/dawn/utils/TextureUtils.h
@@ -17,7 +17,7 @@

 #include <array>

-#include <dawn/webgpu_cpp.h>
+#include "dawn/webgpu_cpp.h"

 #include "dawn/common/Assert.h"

--- a/src/dawn/utils/WGPUHelpers.h
+++ b/src/dawn/utils/WGPUHelpers.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_UTILS_WGPUHELPERS_H_
 #define SRC_DAWN_UTILS_WGPUHELPERS_H_

-#include <dawn/webgpu_cpp.h>
+#include "dawn/webgpu_cpp.h"

 #include <array>
 #include <initializer_list>
--- a/src/dawn/wire/SupportedFeatures.h
+++ b/src/dawn/wire/SupportedFeatures.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_WIRE_SUPPORTEDFEATURES_H_
 #define SRC_DAWN_WIRE_SUPPORTEDFEATURES_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 namespace dawn::wire {

--- a/src/dawn/wire/client/Adapter.h
+++ b/src/dawn/wire/client/Adapter.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_WIRE_CLIENT_ADAPTER_H_
 #define SRC_DAWN_WIRE_CLIENT_ADAPTER_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 #include "dawn/wire/WireClient.h"
 #include "dawn/wire/WireCmd_autogen.h"
--- a/src/dawn/wire/client/Buffer.h
+++ b/src/dawn/wire/client/Buffer.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_WIRE_CLIENT_BUFFER_H_
 #define SRC_DAWN_WIRE_CLIENT_BUFFER_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 #include "dawn/wire/WireClient.h"
 #include "dawn/wire/client/ObjectBase.h"
--- a/src/dawn/wire/client/Client.h
+++ b/src/dawn/wire/client/Client.h
@@ -15,8 +15,8 @@
 #ifndef SRC_DAWN_WIRE_CLIENT_CLIENT_H_
 #define SRC_DAWN_WIRE_CLIENT_CLIENT_H_

-#include <dawn/webgpu.h>
-#include <dawn/wire/Wire.h>
+#include "dawn/webgpu.h"
+#include "dawn/wire/Wire.h"

 #include "dawn/common/LinkedList.h"
 #include "dawn/common/NonCopyable.h"
--- a/src/dawn/wire/client/Device.h
+++ b/src/dawn/wire/client/Device.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_WIRE_CLIENT_DEVICE_H_
 #define SRC_DAWN_WIRE_CLIENT_DEVICE_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 #include "dawn/common/LinkedList.h"
 #include "dawn/wire/WireCmd_autogen.h"
--- a/src/dawn/wire/client/Instance.h
+++ b/src/dawn/wire/client/Instance.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_WIRE_CLIENT_INSTANCE_H_
 #define SRC_DAWN_WIRE_CLIENT_INSTANCE_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 #include "dawn/wire/WireClient.h"
 #include "dawn/wire/WireCmd_autogen.h"
--- a/src/dawn/wire/client/LimitsAndFeatures.h
+++ b/src/dawn/wire/client/LimitsAndFeatures.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_WIRE_CLIENT_LIMITSANDFEATURES_H_
 #define SRC_DAWN_WIRE_CLIENT_LIMITSANDFEATURES_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 #include <unordered_set>

--- a/src/dawn/wire/client/ObjectBase.h
+++ b/src/dawn/wire/client/ObjectBase.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_WIRE_CLIENT_OBJECTBASE_H_
 #define SRC_DAWN_WIRE_CLIENT_OBJECTBASE_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 #include "dawn/common/LinkedList.h"
 #include "dawn/wire/ObjectType_autogen.h"
--- a/src/dawn/wire/client/Queue.h
+++ b/src/dawn/wire/client/Queue.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_WIRE_CLIENT_QUEUE_H_
 #define SRC_DAWN_WIRE_CLIENT_QUEUE_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 #include "dawn/wire/WireClient.h"
 #include "dawn/wire/client/ObjectBase.h"
--- a/src/dawn/wire/client/ShaderModule.h
+++ b/src/dawn/wire/client/ShaderModule.h
@@ -15,7 +15,7 @@
 #ifndef SRC_DAWN_WIRE_CLIENT_SHADERMODULE_H_
 #define SRC_DAWN_WIRE_CLIENT_SHADERMODULE_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 #include "dawn/wire/client/ObjectBase.h"
 #include "dawn/wire/client/RequestTracker.h"
--- a/src/include/dawn/EnumClassBitmasks.h
+++ b/src/include/dawn/EnumClassBitmasks.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_ENUMCLASSBITMASKS_H_
 #define SRC_INCLUDE_DAWN_ENUMCLASSBITMASKS_H_

-#include <dawn/EnumClassBitmasks.h>
+#include "dawn/EnumClassBitmasks.h"

 #endif  // SRC_INCLUDE_DAWN_ENUMCLASSBITMASKS_H_
--- a/src/include/dawn/dawn_proc.h
+++ b/src/include/dawn/dawn_proc.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_DAWN_PROC_H_
 #define SRC_INCLUDE_DAWN_DAWN_PROC_H_

-#include <dawn/dawn_proc.h>
+#include "dawn/dawn_proc.h"

 #endif  // SRC_INCLUDE_DAWN_DAWN_PROC_H_
--- a/src/include/dawn/dawn_thread_dispatch_proc.h
+++ b/src/include/dawn/dawn_thread_dispatch_proc.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_
 #define SRC_INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_

-#include <dawn/dawn_thread_dispatch_proc.h>
+#include "dawn/dawn_thread_dispatch_proc.h"

 #endif  // SRC_INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_
--- a/src/include/dawn/dawn_wsi.h
+++ b/src/include/dawn/dawn_wsi.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_DAWN_WSI_H_
 #define SRC_INCLUDE_DAWN_DAWN_WSI_H_

-#include <dawn/dawn_wsi.h>
+#include "dawn/dawn_wsi.h"

 #endif  // SRC_INCLUDE_DAWN_DAWN_WSI_H_
--- a/src/include/dawn/webgpu.h
+++ b/src/include/dawn/webgpu.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_WEBGPU_H_
 #define SRC_INCLUDE_DAWN_WEBGPU_H_

-#include <dawn/webgpu.h>
+#include "dawn/webgpu.h"

 #endif  // SRC_INCLUDE_DAWN_WEBGPU_H_
--- a/src/include/dawn_native/D3D12Backend.h
+++ b/src/include/dawn_native/D3D12Backend.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
 #define SRC_INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_

-#include <dawn/native/D3D12Backend.h>
+#include "dawn/native/D3D12Backend.h"

 #endif  // SRC_INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
--- a/src/include/dawn_native/DawnNative.h
+++ b/src/include/dawn_native/DawnNative.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_
 #define SRC_INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_

-#include <dawn/native/DawnNative.h>
+#include "dawn/native/DawnNative.h"

 #endif  // SRC_INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_
--- a/src/include/dawn_native/MetalBackend.h
+++ b/src/include/dawn_native/MetalBackend.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_NATIVE_METALBACKEND_H_
 #define SRC_INCLUDE_DAWN_NATIVE_METALBACKEND_H_

-#include <dawn/native/MetalBackend.h>
+#include "dawn/native/MetalBackend.h"

 #endif  // SRC_INCLUDE_DAWN_NATIVE_METALBACKEND_H_
--- a/src/include/dawn_native/NullBackend.h
+++ b/src/include/dawn_native/NullBackend.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_NATIVE_NULLBACKEND_H_
 #define SRC_INCLUDE_DAWN_NATIVE_NULLBACKEND_H_

-#include <dawn/native/NullBackend.h>
+#include "dawn/native/NullBackend.h"

 #endif  // SRC_INCLUDE_DAWN_NATIVE_NULLBACKEND_H_
--- a/src/include/dawn_native/OpenGLBackend.h
+++ b/src/include/dawn_native/OpenGLBackend.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_NATIVE_OPENGLBACKEND_H_
 #define SRC_INCLUDE_DAWN_NATIVE_OPENGLBACKEND_H_

-#include <dawn/native/OpenGLBackend.h>
+#include "dawn/native/OpenGLBackend.h"

 #endif  // SRC_INCLUDE_DAWN_NATIVE_OPENGLBACKEND_H_
--- a/src/include/dawn_native/VulkanBackend.h
+++ b/src/include/dawn_native/VulkanBackend.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_
 #define SRC_INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_

-#include <dawn/native/VulkanBackend.h>
+#include "dawn/native/VulkanBackend.h"

 #endif  // SRC_INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_
--- a/src/include/dawn_native/dawn_native_export.h
+++ b/src/include/dawn_native/dawn_native_export.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_NATIVE_DAWN_NATIVE_EXPORT_H_
 #define SRC_INCLUDE_DAWN_NATIVE_DAWN_NATIVE_EXPORT_H_

-#include <dawn/native/dawn_native_export.h>
+#include "dawn/native/dawn_native_export.h"

 #endif  // SRC_INCLUDE_DAWN_NATIVE_DAWN_NATIVE_EXPORT_H_
--- a/src/include/dawn_platform/DawnPlatform.h
+++ b/src/include/dawn_platform/DawnPlatform.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_
 #define SRC_INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_

-#include <dawn/platform/DawnPlatform.h>
+#include "dawn/platform/DawnPlatform.h"

 #endif  // SRC_INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_
--- a/src/include/dawn_wire/Wire.h
+++ b/src/include/dawn_wire/Wire.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_WIRE_WIRE_H_
 #define SRC_INCLUDE_DAWN_WIRE_WIRE_H_

-#include <dawn/wire/Wire.h>
+#include "dawn/wire/Wire.h"

 #endif  // SRC_INCLUDE_DAWN_WIRE_WIRE_H_
--- a/src/include/dawn_wire/WireClient.h
+++ b/src/include/dawn_wire/WireClient.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_WIRE_WIRECLIENT_H_
 #define SRC_INCLUDE_DAWN_WIRE_WIRECLIENT_H_

-#include <dawn/wire/WireClient.h>
+#include "dawn/wire/WireClient.h"

 #endif  // SRC_INCLUDE_DAWN_WIRE_WIRECLIENT_H_
--- a/src/include/dawn_wire/WireServer.h
+++ b/src/include/dawn_wire/WireServer.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_WIRE_WIRESERVER_H_
 #define SRC_INCLUDE_DAWN_WIRE_WIRESERVER_H_

-#include <dawn/wire/WireServer.h>
+#include "dawn/wire/WireServer.h"

 #endif  // SRC_INCLUDE_DAWN_WIRE_WIRESERVER_H_
--- a/src/include/dawn_wire/dawn_wire_export.h
+++ b/src/include/dawn_wire/dawn_wire_export.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_DAWN_WIRE_DAWN_WIRE_EXPORT_H_
 #define SRC_INCLUDE_DAWN_WIRE_DAWN_WIRE_EXPORT_H_

-#include <dawn/wire/dawn_wire_export.h>
+#include "dawn/wire/dawn_wire_export.h"

 #endif  // SRC_INCLUDE_DAWN_WIRE_DAWN_WIRE_EXPORT_H_
--- a/src/include/webgpu/webgpu_cpp.h
+++ b/src/include/webgpu/webgpu_cpp.h
@@ -15,6 +15,6 @@
 #ifndef SRC_INCLUDE_WEBGPU_WEBGPU_CPP_H_
 #define SRC_INCLUDE_WEBGPU_WEBGPU_CPP_H_

-#include <dawn/webgpu_cpp.h>
+#include "dawn/webgpu_cpp.h"

 #endif  // SRC_INCLUDE_WEBGPU_WEBGPU_CPP_H_