Commit 84f651f5 authored by Sean Gilhuly's avatar Sean Gilhuly Committed by Commit Bot

Use full include path for dawn headers

Change-Id: I4dfa1a776b17d767708d893fc2c18be9b21ce3f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159367Reviewed-by: default avatarkylechar <kylechar@chromium.org>
Reviewed-by: default avatarKai Ninomiya <kainino@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761117}
parent 282a876f
...@@ -8,6 +8,7 @@ include_rules = [ ...@@ -8,6 +8,7 @@ include_rules = [
"+gpu/config", "+gpu/config",
"+gpu/GLES2/gl2extchromium.h", "+gpu/GLES2/gl2extchromium.h",
"+gpu/vulkan", "+gpu/vulkan",
"+third_party/dawn/src/include",
"+third_party/khronos/GLES2/gl2.h", "+third_party/khronos/GLES2/gl2.h",
"+third_party/skia/include/gpu", "+third_party/skia/include/gpu",
"+third_party/vulkan/include", "+third_party/vulkan/include",
......
...@@ -4,11 +4,10 @@ ...@@ -4,11 +4,10 @@
#include "components/viz/common/gpu/dawn_context_provider.h" #include "components/viz/common/gpu/dawn_context_provider.h"
#include <dawn/dawn_proc.h>
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "third_party/dawn/src/include/dawn/dawn_proc.h"
namespace viz { namespace viz {
......
...@@ -5,10 +5,9 @@ ...@@ -5,10 +5,9 @@
#ifndef COMPONENTS_VIZ_COMMON_GPU_DAWN_CONTEXT_PROVIDER_H_ #ifndef COMPONENTS_VIZ_COMMON_GPU_DAWN_CONTEXT_PROVIDER_H_
#define 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 "base/macros.h"
#include "components/viz/common/viz_dawn_context_provider_export.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/GrContext.h"
#include "third_party/skia/include/gpu/dawn/GrDawnTypes.h" #include "third_party/skia/include/gpu/dawn/GrDawnTypes.h"
......
...@@ -11,6 +11,7 @@ include_rules = [ ...@@ -11,6 +11,7 @@ include_rules = [
"+mojo/public/cpp/system/buffer.h", "+mojo/public/cpp/system/buffer.h",
"+mojo/public/cpp/system/platform_handle.h", "+mojo/public/cpp/system/platform_handle.h",
"+skia/buildflags.h", "+skia/buildflags.h",
"+third_party/dawn/src/include",
"+third_party/khronos/GLES2", "+third_party/khronos/GLES2",
"+third_party/skia", "+third_party/skia",
"+third_party/vulkan", "+third_party/vulkan",
......
...@@ -5,13 +5,12 @@ ...@@ -5,13 +5,12 @@
#ifndef COMPONENTS_VIZ_COMMON_RESOURCES_RESOURCE_FORMAT_UTILS_H_ #ifndef COMPONENTS_VIZ_COMMON_RESOURCES_RESOURCE_FORMAT_UTILS_H_
#define COMPONENTS_VIZ_COMMON_RESOURCES_RESOURCE_FORMAT_UTILS_H_ #define COMPONENTS_VIZ_COMMON_RESOURCES_RESOURCE_FORMAT_UTILS_H_
#include <dawn/webgpu_cpp.h>
#include <dawn/webgpu.h>
#include "components/viz/common/resources/resource_format.h" #include "components/viz/common/resources/resource_format.h"
#include "components/viz/common/viz_resource_format_export.h" #include "components/viz/common/viz_resource_format_export.h"
#include "gpu/vulkan/buildflags.h" #include "gpu/vulkan/buildflags.h"
#include "skia/buildflags.h" #include "skia/buildflags.h"
#include "third_party/dawn/src/include/dawn/webgpu.h"
#include "third_party/dawn/src/include/dawn/webgpu_cpp.h"
#include "third_party/skia/include/core/SkImageInfo.h" #include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/gpu/GrTypes.h" #include "third_party/skia/include/gpu/GrTypes.h"
#include "ui/gfx/buffer_types.h" #include "ui/gfx/buffer_types.h"
......
...@@ -30,6 +30,7 @@ include_rules = [ ...@@ -30,6 +30,7 @@ include_rules = [
"+mojo/public/cpp/bindings", "+mojo/public/cpp/bindings",
"+mojo/public/cpp/system", "+mojo/public/cpp/system",
"+skia", "+skia",
"+third_party/dawn/src/include",
"+third_party/khronos/GLES2/gl2.h", "+third_party/khronos/GLES2/gl2.h",
"+third_party/khronos/GLES2/gl2ext.h", "+third_party/khronos/GLES2/gl2ext.h",
"+third_party/skia", "+third_party/skia",
......
...@@ -11,11 +11,10 @@ ...@@ -11,11 +11,10 @@
#include "ui/gfx/vsync_provider.h" #include "ui/gfx/vsync_provider.h"
#if defined(OS_WIN) #if defined(OS_WIN)
#include <dawn_native/D3D12Backend.h> #include "third_party/dawn/src/include/dawn_native/D3D12Backend.h"
#include "ui/gl/vsync_provider_win.h" #include "ui/gl/vsync_provider_win.h"
#elif defined(OS_LINUX) #elif defined(OS_LINUX)
#include <dawn_native/VulkanBackend.h> #include "third_party/dawn/src/include/dawn_native/VulkanBackend.h"
#endif #endif
namespace viz { namespace viz {
......
...@@ -5,11 +5,10 @@ ...@@ -5,11 +5,10 @@
#ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SKIA_OUTPUT_DEVICE_DAWN_H_ #ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SKIA_OUTPUT_DEVICE_DAWN_H_
#define 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/webgpu.h>
#include <dawn_native/DawnNative.h>
#include "components/viz/service/display_embedder/skia_output_device.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/webgpu.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/SkColorSpace.h"
#include "third_party/skia/include/core/SkImageInfo.h" #include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/gpu/GrBackendSurface.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