rewrite includes to not need so much -Ifoo
Current strategy: everything from the top
Things to look at first are the manual changes:
- added tools/rewrite_includes.py
- removed -Idirectives from BUILD.gn
- various compile.sh simplifications
- tweak tools/embed_resources.py
- update gn/find_headers.py to write paths from the top
- update gn/gn_to_bp.py SkUserConfig.h layout
so that #include "include/config/SkUserConfig.h" always
gets the header we want.
No-Presubmit: true
Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
diff --git a/tools/gpu/FenceSync.h b/tools/gpu/FenceSync.h
index 4fe724a..146b3a2 100644
--- a/tools/gpu/FenceSync.h
+++ b/tools/gpu/FenceSync.h
@@ -8,7 +8,7 @@
#ifndef FenceSync_DEFINED
#define FenceSync_DEFINED
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
namespace sk_gpu_test {
diff --git a/tools/gpu/GpuTimer.h b/tools/gpu/GpuTimer.h
index f5c9c91..048dec7 100644
--- a/tools/gpu/GpuTimer.h
+++ b/tools/gpu/GpuTimer.h
@@ -8,8 +8,8 @@
#ifndef GpuTimer_DEFINED
#define GpuTimer_DEFINED
-#include "SkTypes.h"
-#include "SkExchange.h"
+#include "include/core/SkTypes.h"
+#include "src/core/SkExchange.h"
#include <chrono>
diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp
index 150a880..f5520d2 100644
--- a/tools/gpu/GrContextFactory.cpp
+++ b/tools/gpu/GrContextFactory.cpp
@@ -6,23 +6,23 @@
* found in the LICENSE file.
*/
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "gl/GLTestContext.h"
+#include "src/gpu/GrContextPriv.h"
+#include "tools/gpu/GrContextFactory.h"
+#include "tools/gpu/gl/GLTestContext.h"
#if SK_ANGLE
- #include "gl/angle/GLTestContext_angle.h"
+ #include "tools/gpu/gl/angle/GLTestContext_angle.h"
#endif
-#include "gl/command_buffer/GLTestContext_command_buffer.h"
+#include "tools/gpu/gl/command_buffer/GLTestContext_command_buffer.h"
#ifdef SK_VULKAN
-#include "vk/VkTestContext.h"
+#include "tools/gpu/vk/VkTestContext.h"
#endif
#ifdef SK_METAL
-#include "mtl/MtlTestContext.h"
+#include "tools/gpu/mtl/MtlTestContext.h"
#endif
-#include "gl/GrGLGpu.h"
-#include "mock/MockTestContext.h"
-#include "GrCaps.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/gl/GrGLGpu.h"
+#include "tools/gpu/mock/MockTestContext.h"
#if defined(SK_BUILD_FOR_WIN) && defined(SK_ENABLE_DISCRETE_GPU)
extern "C" {
diff --git a/tools/gpu/GrContextFactory.h b/tools/gpu/GrContextFactory.h
index 4a7927c..c708527 100644
--- a/tools/gpu/GrContextFactory.h
+++ b/tools/gpu/GrContextFactory.h
@@ -8,11 +8,11 @@
#ifndef GrContextFactory_DEFINED
#define GrContextFactory_DEFINED
-#include "GrContext.h"
-#include "GrContextOptions.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrContextOptions.h"
-#include "gl/GLTestContext.h"
-#include "SkTArray.h"
+#include "include/private/SkTArray.h"
+#include "tools/gpu/gl/GLTestContext.h"
struct GrVkBackendContext;
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index b8a743f..88a3a8c 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -5,34 +5,34 @@
* found in the LICENSE file.
*/
-#include "GrBackendSurface.h"
-#include "GrClip.h"
-#include "GrContextOptions.h"
-#include "GrContextPriv.h"
-#include "GrDrawOpAtlas.h"
-#include "GrDrawingManager.h"
-#include "GrGpu.h"
-#include "GrGpuResourceCacheAccess.h"
-#include "GrMemoryPool.h"
-#include "GrRecordingContext.h"
-#include "GrRecordingContextPriv.h"
-#include "GrRenderTargetContext.h"
-#include "GrRenderTargetContextPriv.h"
-#include "GrRenderTargetProxy.h"
-#include "GrResourceCache.h"
-#include "GrSemaphore.h"
-#include "GrSurfaceContextPriv.h"
-#include "GrTexture.h"
-#include "SkGr.h"
-#include "SkImage_Gpu.h"
-#include "SkMathPriv.h"
-#include "SkString.h"
-#include "SkTo.h"
-#include "ccpr/GrCoverageCountingPathRenderer.h"
-#include "ccpr/GrCCPathCache.h"
-#include "ops/GrMeshDrawOp.h"
-#include "text/GrStrikeCache.h"
-#include "text/GrTextBlobCache.h"
+#include "include/core/SkString.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrContextOptions.h"
+#include "include/gpu/GrTexture.h"
+#include "include/private/GrRecordingContext.h"
+#include "include/private/GrRenderTargetProxy.h"
+#include "include/private/SkTo.h"
+#include "src/core/SkMathPriv.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrDrawOpAtlas.h"
+#include "src/gpu/GrDrawingManager.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrGpuResourceCacheAccess.h"
+#include "src/gpu/GrMemoryPool.h"
+#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrResourceCache.h"
+#include "src/gpu/GrSemaphore.h"
+#include "src/gpu/GrSurfaceContextPriv.h"
+#include "src/gpu/SkGr.h"
+#include "src/gpu/ccpr/GrCCPathCache.h"
+#include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
+#include "src/gpu/ops/GrMeshDrawOp.h"
+#include "src/gpu/text/GrStrikeCache.h"
+#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/image/SkImage_Gpu.h"
#include <algorithm>
diff --git a/tools/gpu/MemoryCache.cpp b/tools/gpu/MemoryCache.cpp
index 2cc4102..d7dae9d 100644
--- a/tools/gpu/MemoryCache.cpp
+++ b/tools/gpu/MemoryCache.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "GrPersistentCacheUtils.h"
-#include "MemoryCache.h"
-#include "SkBase64.h"
-#include "SkMD5.h"
+#include "include/utils/SkBase64.h"
+#include "src/core/SkMD5.h"
+#include "src/gpu/GrPersistentCacheUtils.h"
+#include "tools/gpu/MemoryCache.h"
#if defined(SK_VULKAN)
-#include "vk/GrVkGpu.h"
+#include "src/gpu/vk/GrVkGpu.h"
#endif
// Change this to 1 to log cache hits/misses/stores using SkDebugf.
diff --git a/tools/gpu/MemoryCache.h b/tools/gpu/MemoryCache.h
index 1e61994..22911a5 100644
--- a/tools/gpu/MemoryCache.h
+++ b/tools/gpu/MemoryCache.h
@@ -8,9 +8,9 @@
#ifndef MemoryCache_DEFINED
#define MemoryCache_DEFINED
-#include "GrContextOptions.h"
-#include "SkChecksum.h"
-#include "SkData.h"
+#include "include/core/SkData.h"
+#include "include/gpu/GrContextOptions.h"
+#include "include/private/SkChecksum.h"
#include <unordered_map>
diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp
index 8167264..216118a 100644
--- a/tools/gpu/ProxyUtils.cpp
+++ b/tools/gpu/ProxyUtils.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "ProxyUtils.h"
-#include "GrBackendSurface.h"
-#include "GrContextPriv.h"
-#include "GrDrawingManager.h"
-#include "GrGpu.h"
-#include "GrProxyProvider.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrDrawingManager.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "tools/gpu/ProxyUtils.h"
namespace sk_gpu_test {
diff --git a/tools/gpu/ProxyUtils.h b/tools/gpu/ProxyUtils.h
index 3ad23ae..e8526a9 100644
--- a/tools/gpu/ProxyUtils.h
+++ b/tools/gpu/ProxyUtils.h
@@ -8,8 +8,8 @@
#ifndef ProxyUtils_DEFINED
#define ProxyUtils_DEFINED
-#include "GrTextureProxy.h"
-#include "GrTypesPriv.h"
+#include "include/private/GrTextureProxy.h"
+#include "include/private/GrTypesPriv.h"
namespace sk_gpu_test {
diff --git a/tools/gpu/TestContext.cpp b/tools/gpu/TestContext.cpp
index f760cc7..bf961fb 100644
--- a/tools/gpu/TestContext.cpp
+++ b/tools/gpu/TestContext.cpp
@@ -6,11 +6,11 @@
* found in the LICENSE file.
*/
-#include "TestContext.h"
+#include "tools/gpu/TestContext.h"
-#include "GpuTimer.h"
+#include "tools/gpu/GpuTimer.h"
-#include "GrContext.h"
+#include "include/gpu/GrContext.h"
namespace sk_gpu_test {
TestContext::TestContext()
diff --git a/tools/gpu/TestContext.h b/tools/gpu/TestContext.h
index 7a92bc0..e48c598 100644
--- a/tools/gpu/TestContext.h
+++ b/tools/gpu/TestContext.h
@@ -9,12 +9,12 @@
#ifndef TestContext_DEFINED
#define TestContext_DEFINED
-#include "FenceSync.h"
-#include "GrTypes.h"
-#include "SkNoncopyable.h"
-#include "SkRefCnt.h"
-#include "SkScopeExit.h"
-#include "SkTemplates.h"
+#include "include/core/SkRefCnt.h"
+#include "include/gpu/GrTypes.h"
+#include "include/private/SkNoncopyable.h"
+#include "include/private/SkTemplates.h"
+#include "src/core/SkScopeExit.h"
+#include "tools/gpu/FenceSync.h"
class GrContext;
struct GrContextOptions;
diff --git a/tools/gpu/YUVUtils.cpp b/tools/gpu/YUVUtils.cpp
index 8f68986..eb4ca2c 100644
--- a/tools/gpu/YUVUtils.cpp
+++ b/tools/gpu/YUVUtils.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "YUVUtils.h"
+#include "tools/gpu/YUVUtils.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "SkCodecImageGenerator.h"
-#include "SkData.h"
+#include "include/core/SkData.h"
+#include "include/gpu/GrContext.h"
+#include "src/codec/SkCodecImageGenerator.h"
+#include "src/gpu/GrContextPriv.h"
namespace sk_gpu_test {
diff --git a/tools/gpu/YUVUtils.h b/tools/gpu/YUVUtils.h
index b46b35b..f6097b9 100644
--- a/tools/gpu/YUVUtils.h
+++ b/tools/gpu/YUVUtils.h
@@ -8,10 +8,10 @@
#ifndef YUVUtils_DEFINED
#define YUVUtils_DEFINED
-#include "SkAutoMalloc.h"
-#include "SkImage.h"
-#include "SkYUVAIndex.h"
-#include "SkYUVASizeInfo.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkYUVAIndex.h"
+#include "include/core/SkYUVASizeInfo.h"
+#include "src/core/SkAutoMalloc.h"
class SkData;
diff --git a/tools/gpu/atlastext/GLTestAtlasTextRenderer.cpp b/tools/gpu/atlastext/GLTestAtlasTextRenderer.cpp
index 0bc3ae8..c8dc054 100644
--- a/tools/gpu/atlastext/GLTestAtlasTextRenderer.cpp
+++ b/tools/gpu/atlastext/GLTestAtlasTextRenderer.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "GLTestAtlasTextRenderer.h"
-#include "../gl/GLTestContext.h"
-#include "SkBitmap.h"
-#include "TestAtlasTextRenderer.h"
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLUtil.h"
+#include "include/core/SkBitmap.h"
+#include "src/gpu/gl/GrGLDefines.h"
+#include "src/gpu/gl/GrGLUtil.h"
+#include "tools/gpu/atlastext/GLTestAtlasTextRenderer.h"
+#include "tools/gpu/atlastext/TestAtlasTextRenderer.h"
+#include "tools/gpu/gl/GLTestContext.h"
using sk_gpu_test::GLTestContext;
diff --git a/tools/gpu/atlastext/GLTestAtlasTextRenderer.h b/tools/gpu/atlastext/GLTestAtlasTextRenderer.h
index df01b34..d1536d3 100644
--- a/tools/gpu/atlastext/GLTestAtlasTextRenderer.h
+++ b/tools/gpu/atlastext/GLTestAtlasTextRenderer.h
@@ -8,7 +8,7 @@
#ifndef GLTestAtlasTextRenderer_DEFINED
#define GLTestAtlasTextRenderer_DEFINED
-#include "SkRefCnt.h"
+#include "include/core/SkRefCnt.h"
namespace sk_gpu_test {
diff --git a/tools/gpu/atlastext/TestAtlasTextRenderer.h b/tools/gpu/atlastext/TestAtlasTextRenderer.h
index 6ba4326..e928e76 100644
--- a/tools/gpu/atlastext/TestAtlasTextRenderer.h
+++ b/tools/gpu/atlastext/TestAtlasTextRenderer.h
@@ -8,8 +8,8 @@
#ifndef TestAtlasTextRenderer_DEFINED
#define TestAtlasTextRenderer_DEFINED
-#include "SkAtlasTextRenderer.h"
-#include "SkBitmap.h"
+#include "include/atlastext/SkAtlasTextRenderer.h"
+#include "include/core/SkBitmap.h"
namespace sk_gpu_test {
diff --git a/tools/gpu/gl/GLTestContext.cpp b/tools/gpu/gl/GLTestContext.cpp
index 2e12b47..d4aa605 100644
--- a/tools/gpu/gl/GLTestContext.cpp
+++ b/tools/gpu/gl/GLTestContext.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "GLTestContext.h"
+#include "tools/gpu/gl/GLTestContext.h"
-#include "GrContext.h"
-#include "GpuTimer.h"
-#include "gl/GrGLUtil.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/gl/GrGLUtil.h"
+#include "tools/gpu/GpuTimer.h"
namespace {
diff --git a/tools/gpu/gl/GLTestContext.h b/tools/gpu/gl/GLTestContext.h
index c431664..197148c 100644
--- a/tools/gpu/gl/GLTestContext.h
+++ b/tools/gpu/gl/GLTestContext.h
@@ -8,8 +8,8 @@
#ifndef GLTestContext_DEFINED
#define GLTestContext_DEFINED
-#include "TestContext.h"
-#include "gl/GrGLInterface.h"
+#include "include/gpu/gl/GrGLInterface.h"
+#include "tools/gpu/TestContext.h"
namespace sk_gpu_test {
/**
diff --git a/tools/gpu/gl/angle/GLTestContext_angle.cpp b/tools/gpu/gl/angle/GLTestContext_angle.cpp
index 303b8ea..c359481 100644
--- a/tools/gpu/gl/angle/GLTestContext_angle.cpp
+++ b/tools/gpu/gl/angle/GLTestContext_angle.cpp
@@ -5,19 +5,19 @@
* found in the LICENSE file.
*/
-#include "GLTestContext_angle.h"
+#include "tools/gpu/gl/angle/GLTestContext_angle.h"
#define EGL_EGL_PROTOTYPES 1
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLUtil.h"
+#include "src/gpu/gl/GrGLDefines.h"
+#include "src/gpu/gl/GrGLUtil.h"
-#include "gl/GrGLInterface.h"
-#include "gl/GrGLAssembleInterface.h"
-#include "../ports/SkOSLibrary.h"
+#include "include/gpu/gl/GrGLAssembleInterface.h"
+#include "include/gpu/gl/GrGLInterface.h"
+#include "src/ports/SkOSLibrary.h"
#include <EGL/egl.h>
diff --git a/tools/gpu/gl/angle/GLTestContext_angle.h b/tools/gpu/gl/angle/GLTestContext_angle.h
index de7659a..1dc563a 100644
--- a/tools/gpu/gl/angle/GLTestContext_angle.h
+++ b/tools/gpu/gl/angle/GLTestContext_angle.h
@@ -8,7 +8,7 @@
#ifndef GLTestContext_angle_DEFINED
#define GLTestContext_angle_DEFINED
-#include "gl/GLTestContext.h"
+#include "tools/gpu/gl/GLTestContext.h"
namespace sk_gpu_test {
diff --git a/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp b/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp
index 743aa4e..cf82e35 100644
--- a/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp
+++ b/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp
@@ -8,13 +8,13 @@
#ifndef SK_NO_COMMAND_BUFFER
-#include "SkMutex.h"
-#include "SkOnce.h"
-#include "SkTLS.h"
-#include "gl/GrGLInterface.h"
-#include "gl/GrGLAssembleInterface.h"
-#include "gl/command_buffer/GLTestContext_command_buffer.h"
-#include "../ports/SkOSLibrary.h"
+#include "include/gpu/gl/GrGLAssembleInterface.h"
+#include "include/gpu/gl/GrGLInterface.h"
+#include "include/private/SkMutex.h"
+#include "include/private/SkOnce.h"
+#include "src/core/SkTLS.h"
+#include "src/ports/SkOSLibrary.h"
+#include "tools/gpu/gl/command_buffer/GLTestContext_command_buffer.h"
namespace {
diff --git a/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.h b/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.h
index 6a631be..089c06e 100644
--- a/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.h
+++ b/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.h
@@ -9,7 +9,7 @@
#ifndef GLTestContext_command_buffer_DEFINED
#define GLTestContext_command_buffer_DEFINED
-#include "gl/GLTestContext.h"
+#include "tools/gpu/gl/GLTestContext.h"
namespace sk_gpu_test {
class CommandBufferGLTestContext : public GLTestContext {
diff --git a/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp b/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp
index 7cc94be..aefcc35 100644
--- a/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp
+++ b/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp
@@ -5,7 +5,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "gl/GLTestContext.h"
+#include "tools/gpu/gl/GLTestContext.h"
#define GL_GLEXT_PROTOTYPES
#include <GLES2/gl2.h>
@@ -13,8 +13,8 @@
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLUtil.h"
+#include "src/gpu/gl/GrGLDefines.h"
+#include "src/gpu/gl/GrGLUtil.h"
namespace {
diff --git a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
index 3df45bd..5e643e2 100644
--- a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
+++ b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "gl/GLTestContext.h"
-#include "SkOnce.h"
+#include "include/private/SkOnce.h"
+#include "tools/gpu/gl/GLTestContext.h"
#include <X11/Xlib.h>
#include <GL/glx.h>
diff --git a/tools/gpu/gl/iOS/CreatePlatformGLTestContext_iOS.mm b/tools/gpu/gl/iOS/CreatePlatformGLTestContext_iOS.mm
index 2b0ad81..0605fdf 100644
--- a/tools/gpu/gl/iOS/CreatePlatformGLTestContext_iOS.mm
+++ b/tools/gpu/gl/iOS/CreatePlatformGLTestContext_iOS.mm
@@ -6,7 +6,7 @@
* found in the LICENSE file.
*/
-#include "gl/GLTestContext.h"
+#include "tools/gpu/gl/GLTestContext.h"
#import <OpenGLES/EAGL.h>
#include <dlfcn.h>
diff --git a/tools/gpu/gl/mac/CreatePlatformGLTestContext_mac.cpp b/tools/gpu/gl/mac/CreatePlatformGLTestContext_mac.cpp
index 5b11227..c27fe24 100644
--- a/tools/gpu/gl/mac/CreatePlatformGLTestContext_mac.cpp
+++ b/tools/gpu/gl/mac/CreatePlatformGLTestContext_mac.cpp
@@ -5,9 +5,9 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "gl/GLTestContext.h"
+#include "tools/gpu/gl/GLTestContext.h"
#include "AvailabilityMacros.h"
#include <OpenGL/OpenGL.h>
diff --git a/tools/gpu/gl/none/CreatePlatformGLTestContext_none.cpp b/tools/gpu/gl/none/CreatePlatformGLTestContext_none.cpp
index 25343b0..de2f935 100644
--- a/tools/gpu/gl/none/CreatePlatformGLTestContext_none.cpp
+++ b/tools/gpu/gl/none/CreatePlatformGLTestContext_none.cpp
@@ -6,7 +6,7 @@
* found in the LICENSE file.
*/
-#include "gl/GLTestContext.h"
+#include "tools/gpu/gl/GLTestContext.h"
namespace sk_gpu_test {
GLTestContext* CreatePlatformGLTestContext(GrGLStandard forcedGpuAPI,
diff --git a/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp b/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
index 5d496e4..7159c13 100644
--- a/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
+++ b/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
@@ -6,7 +6,7 @@
* found in the LICENSE file.
*/
-#include "gl/GLTestContext.h"
+#include "tools/gpu/gl/GLTestContext.h"
#if defined(_M_ARM64)
@@ -20,7 +20,7 @@
#include <windows.h>
#include <GL/GL.h>
-#include "win/SkWGL.h"
+#include "src/utils/win/SkWGL.h"
#include <windows.h>
diff --git a/tools/gpu/mock/MockTestContext.cpp b/tools/gpu/mock/MockTestContext.cpp
index 3bcf0f1..f892714 100644
--- a/tools/gpu/mock/MockTestContext.cpp
+++ b/tools/gpu/mock/MockTestContext.cpp
@@ -8,9 +8,9 @@
#ifndef GLTestContext_DEFINED
#define GLTestContext_DEFINED
-#include "MockTestContext.h"
+#include "tools/gpu/mock/MockTestContext.h"
-#include "GrContext.h"
+#include "include/gpu/GrContext.h"
namespace {
diff --git a/tools/gpu/mock/MockTestContext.h b/tools/gpu/mock/MockTestContext.h
index 4c3a52f..aae7fad 100644
--- a/tools/gpu/mock/MockTestContext.h
+++ b/tools/gpu/mock/MockTestContext.h
@@ -8,7 +8,7 @@
#ifndef MockTestContext_DEFINED
#define MockTestContext_DEFINED
-#include "TestContext.h"
+#include "tools/gpu/TestContext.h"
namespace sk_gpu_test {
diff --git a/tools/gpu/mtl/MtlTestContext.h b/tools/gpu/mtl/MtlTestContext.h
index a44e27c..dbda09d 100644
--- a/tools/gpu/mtl/MtlTestContext.h
+++ b/tools/gpu/mtl/MtlTestContext.h
@@ -8,7 +8,7 @@
#ifndef MtlTestContext_h
#define MtlTestContext_h
-#include "TestContext.h"
+#include "tools/gpu/TestContext.h"
#ifdef SK_METAL
diff --git a/tools/gpu/mtl/MtlTestContext.mm b/tools/gpu/mtl/MtlTestContext.mm
index 69aa91e..a7e0eea 100644
--- a/tools/gpu/mtl/MtlTestContext.mm
+++ b/tools/gpu/mtl/MtlTestContext.mm
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "MtlTestContext.h"
+#include "tools/gpu/mtl/MtlTestContext.h"
-#include "GrContext.h"
-#include "GrContextOptions.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrContextOptions.h"
#ifdef SK_METAL
diff --git a/tools/gpu/vk/GrVulkanDefines.h b/tools/gpu/vk/GrVulkanDefines.h
index 843fcfd..ad65a84 100644
--- a/tools/gpu/vk/GrVulkanDefines.h
+++ b/tools/gpu/vk/GrVulkanDefines.h
@@ -8,7 +8,7 @@
#ifndef GrVulkanDefines_DEFINED
#define GrVulkanDefines_DEFINED
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#if defined(SK_BUILD_FOR_WIN)
# if !defined(VK_USE_PLATFORM_WIN32_KHR)
diff --git a/tools/gpu/vk/VkTestContext.cpp b/tools/gpu/vk/VkTestContext.cpp
index 18c2393..6215efe 100644
--- a/tools/gpu/vk/VkTestContext.cpp
+++ b/tools/gpu/vk/VkTestContext.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "VkTestContext.h"
+#include "tools/gpu/vk/VkTestContext.h"
#ifdef SK_VULKAN
-#include "GrContext.h"
-#include "VkTestUtils.h"
-#include "vk/GrVkExtensions.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/vk/GrVkExtensions.h"
+#include "tools/gpu/vk/VkTestUtils.h"
namespace {
diff --git a/tools/gpu/vk/VkTestContext.h b/tools/gpu/vk/VkTestContext.h
index a1a1fe1..fd4d8d2 100644
--- a/tools/gpu/vk/VkTestContext.h
+++ b/tools/gpu/vk/VkTestContext.h
@@ -8,12 +8,12 @@
#ifndef VkTestContext_DEFINED
#define VkTestContext_DEFINED
-#include "TestContext.h"
+#include "tools/gpu/TestContext.h"
#ifdef SK_VULKAN
-#include "GrVulkanDefines.h"
-#include "vk/GrVkBackendContext.h"
+#include "include/gpu/vk/GrVkBackendContext.h"
+#include "tools/gpu/vk/GrVulkanDefines.h"
class GrVkExtensions;
diff --git a/tools/gpu/vk/VkTestUtils.cpp b/tools/gpu/vk/VkTestUtils.cpp
index b7148fa..cd6aa5b 100644
--- a/tools/gpu/vk/VkTestUtils.cpp
+++ b/tools/gpu/vk/VkTestUtils.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "VkTestUtils.h"
+#include "tools/gpu/vk/VkTestUtils.h"
#ifdef SK_VULKAN
-#include "SkAutoMalloc.h"
-#include "vk/GrVkBackendContext.h"
-#include "vk/GrVkExtensions.h"
-#include "../ports/SkOSLibrary.h"
+#include "include/gpu/vk/GrVkBackendContext.h"
+#include "include/gpu/vk/GrVkExtensions.h"
+#include "src/core/SkAutoMalloc.h"
+#include "src/ports/SkOSLibrary.h"
#if defined(SK_ENABLE_SCOPED_LSAN_SUPPRESSIONS)
#include <sanitizer/lsan_interface.h>
diff --git a/tools/gpu/vk/VkTestUtils.h b/tools/gpu/vk/VkTestUtils.h
index ef87f09..6772648 100644
--- a/tools/gpu/vk/VkTestUtils.h
+++ b/tools/gpu/vk/VkTestUtils.h
@@ -8,13 +8,13 @@
#ifndef VkTestUtils_DEFINED
#define VkTestUtils_DEFINED
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#ifdef SK_VULKAN
-#include "GrVulkanDefines.h"
-#include "vk/GrVkBackendContext.h"
-#include "vk/GrVkTypes.h"
+#include "include/gpu/vk/GrVkBackendContext.h"
+#include "include/gpu/vk/GrVkTypes.h"
+#include "tools/gpu/vk/GrVulkanDefines.h"
#include <functional>
class GrVkExtensions;