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>
This commit is contained in:
dan sinclair 2022-04-19 14:24:04 +00:00 committed by Dawn LUCI CQ
parent 9aa4b11281
commit d0fb4a36ac
57 changed files with 74 additions and 73 deletions

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include <dawn/{{metadata.api.lower()}}.h>
#include "dawn/{{metadata.api.lower()}}.h"
namespace dawn::native {

View File

@ -15,7 +15,7 @@
#ifndef DAWNWIRE_WIRECMD_AUTOGEN_H_
#define DAWNWIRE_WIRECMD_AUTOGEN_H_
#include <dawn/webgpu.h>
#include "dawn/webgpu.h"
#include "dawn/wire/BufferConsumer.h"
#include "dawn/wire/ObjectType_autogen.h"

View File

@ -19,8 +19,8 @@
{% set Prefix = metadata.proc_table_prefix %}
{% set prefix = Prefix.lower() %}
#include <dawn/{{prefix}}_proc_table.h>
#include <dawn/{{api}}.h>
#include "dawn/{{prefix}}_proc_table.h"
#include "dawn/{{api}}.h"
#include <gmock/gmock.h>
#include <memory>

View File

@ -15,7 +15,7 @@
#ifndef INCLUDE_DAWN_DAWN_WSI_H_
#define INCLUDE_DAWN_DAWN_WSI_H_
#include <dawn/webgpu.h>
#include "dawn/webgpu.h"
// Error message (or nullptr if there was no error)
typedef const char* DawnSwapChainError;

View File

@ -15,9 +15,6 @@
#ifndef INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
#define INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
#include <dawn/dawn_wsi.h>
#include <dawn/native/DawnNative.h>
#include <DXGI1_4.h>
#include <d3d12.h>
#include <windows.h>
@ -25,6 +22,9 @@
#include <memory>
#include "dawn/dawn_wsi.h"
#include "dawn/native/DawnNative.h"
struct ID3D12Device;
struct ID3D12Resource;

View File

@ -15,13 +15,13 @@
#ifndef INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_
#define INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_
#include <dawn/dawn_proc_table.h>
#include <dawn/native/dawn_native_export.h>
#include <dawn/webgpu.h>
#include <string>
#include <vector>
#include "dawn/dawn_proc_table.h"
#include "dawn/native/dawn_native_export.h"
#include "dawn/webgpu.h"
namespace dawn::platform {
class Platform;
} // namespace dawn::platform

View File

@ -15,8 +15,8 @@
#ifndef INCLUDE_DAWN_NATIVE_METALBACKEND_H_
#define INCLUDE_DAWN_NATIVE_METALBACKEND_H_
#include <dawn/dawn_wsi.h>
#include <dawn/native/DawnNative.h>
#include "dawn/dawn_wsi.h"
#include "dawn/native/DawnNative.h"
// The specifics of the Metal backend expose types in function signatures that might not be
// available in dependent's minimum supported SDK version. Suppress all availability errors using

View File

@ -15,8 +15,8 @@
#ifndef INCLUDE_DAWN_NATIVE_NULLBACKEND_H_
#define INCLUDE_DAWN_NATIVE_NULLBACKEND_H_
#include <dawn/dawn_wsi.h>
#include <dawn/native/DawnNative.h>
#include "dawn/dawn_wsi.h"
#include "dawn/native/DawnNative.h"
namespace dawn::native::null {
DAWN_NATIVE_EXPORT DawnSwapChainImplementation CreateNativeSwapChainImpl();

View File

@ -17,8 +17,8 @@
typedef void* EGLImage;
#include <dawn/dawn_wsi.h>
#include <dawn/native/DawnNative.h>
#include "dawn/dawn_wsi.h"
#include "dawn/native/DawnNative.h"
namespace dawn::native::opengl {

View File

@ -15,13 +15,13 @@
#ifndef INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_
#define INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_
#include <dawn/dawn_wsi.h>
#include <dawn/native/DawnNative.h>
#include <vulkan/vulkan.h>
#include <vector>
#include "dawn/dawn_wsi.h"
#include "dawn/native/DawnNative.h"
namespace dawn::native::vulkan {
DAWN_NATIVE_EXPORT VkInstance GetInstance(WGPUDevice device);

View File

@ -15,13 +15,12 @@
#ifndef INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_
#define INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_
#include <dawn/webgpu.h>
#include <cstddef>
#include <cstdint>
#include <memory>
#include "dawn/platform/dawn_platform_export.h"
#include "dawn/webgpu.h"
namespace dawn::platform {

View File

@ -15,6 +15,6 @@
#ifndef INCLUDE_WEBGPU_WEBGPU_CPP_H_
#define INCLUDE_WEBGPU_WEBGPU_CPP_H_
#include <dawn/webgpu_cpp.h>
#include "dawn/webgpu_cpp.h"
#endif // INCLUDE_WEBGPU_WEBGPU_CPP_H_

View File

@ -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 {

View File

@ -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;

View File

@ -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>

View File

@ -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 {

View File

@ -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>

View File

@ -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 {

View File

@ -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>

View File

@ -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",
]
}

View File

@ -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>

View File

@ -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();

View File

@ -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",
]

View File

@ -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>

View File

@ -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"

View File

@ -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"

View File

@ -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 {

View File

@ -17,7 +17,7 @@
#include <array>
#include <dawn/webgpu_cpp.h>
#include "dawn/webgpu_cpp.h"
#include "dawn/common/Assert.h"

View File

@ -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>

View File

@ -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 {

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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>

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_

View File

@ -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_