Commit c5ae7f30 authored by Sean Gilhuly's avatar Sean Gilhuly Committed by Commit Bot

Use <dawn/dawncpp.h> style includes in DawnContextProvider

Idiomatically, the dawn headers are included with angle-bracket style,
using dawn, dawn_native, etc. as the root. This is the include style
used in existing webgpu code in Chromium, eg. webgpu_decoder_impl.cc.
Refactor the DawnContextProvider and SkiaOutputSurfaceDawn code to match
this style.

Bug: 1021566
Change-Id: I3d462b432d763189350a31050ae334dd2bc56b84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1911600Reviewed-by: default avatarJonathan Backer <backer@chromium.org>
Commit-Queue: Sean Gilhuly <sgilhuly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714536}
parent c07eef17
......@@ -7,7 +7,6 @@ include_rules = [
"+gpu/command_buffer",
"+gpu/GLES2/gl2extchromium.h",
"+gpu/vulkan",
"+third_party/dawn/src/include",
"+third_party/khronos/GLES2/gl2.h",
"+third_party/skia/include/gpu",
"+third_party/vulkan/include",
......
......@@ -4,10 +4,11 @@
#include "components/viz/common/gpu/dawn_context_provider.h"
#include <dawn/dawn_proc.h>
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "third_party/dawn/src/include/dawn/dawn_proc.h"
namespace viz {
......
......@@ -5,9 +5,10 @@
#ifndef COMPONENTS_VIZ_COMMON_GPU_DAWN_CONTEXT_PROVIDER_H_
#define COMPONENTS_VIZ_COMMON_GPU_DAWN_CONTEXT_PROVIDER_H_
#include <dawn_native/DawnNative.h>
#include "base/macros.h"
#include "components/viz/common/viz_dawn_context_provider_export.h"
#include "third_party/dawn/src/include/dawn_native/DawnNative.h"
#include "third_party/skia/include/gpu/GrContext.h"
#include "third_party/skia/include/gpu/dawn/GrDawnTypes.h"
......
......@@ -11,7 +11,6 @@ include_rules = [
"+mojo/public/cpp/system/buffer.h",
"+mojo/public/cpp/system/platform_handle.h",
"+skia/buildflags.h",
"+third_party/dawn/src/include",
"+third_party/khronos/GLES2",
"+third_party/skia",
"+third_party/vulkan",
......
......@@ -18,7 +18,7 @@
#endif
#if BUILDFLAG(SKIA_USE_DAWN)
#include "third_party/dawn/src/include/dawn/dawncpp.h" // nogncheck
#include <dawn/dawncpp.h>
#endif
namespace viz {
......
......@@ -31,7 +31,6 @@ include_rules = [
"+mojo/public/cpp/bindings",
"+mojo/public/cpp/system",
"+skia",
"+third_party/dawn/src/include",
"+third_party/khronos/GLES2/gl2.h",
"+third_party/khronos/GLES2/gl2ext.h",
"+third_party/skia",
......
......@@ -9,9 +9,9 @@
#include "components/viz/common/gpu/dawn_context_provider.h"
#if defined(OS_WIN)
#include "third_party/dawn/src/include/dawn_native/D3D12Backend.h"
#include <dawn_native/D3D12Backend.h>
#elif defined(OS_LINUX)
#include "third_party/dawn/src/include/dawn_native/VulkanBackend.h"
#include <dawn_native/VulkanBackend.h>
#endif
namespace viz {
......
......@@ -5,10 +5,11 @@
#ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SKIA_OUTPUT_DEVICE_DAWN_H_
#define COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SKIA_OUTPUT_DEVICE_DAWN_H_
#include <dawn/dawn_wsi.h>
#include <dawn/dawncpp.h>
#include <dawn_native/DawnNative.h>
#include "components/viz/service/display_embedder/skia_output_device.h"
#include "third_party/dawn/src/include/dawn/dawn_wsi.h"
#include "third_party/dawn/src/include/dawn/dawncpp.h"
#include "third_party/dawn/src/include/dawn_native/DawnNative.h"
#include "third_party/skia/include/core/SkColorSpace.h"
#include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/gpu/GrBackendSurface.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment