[bazel] Update Clang (and IWYU) to 15.0.1 using CIPD
Suggested review order:
- toolchain/download_linux_amd64_toolchain.bzl to see how we
download the CIPD package that was uploaded to our GCS mirror
instead of the GitHub or Debian packages used otherwise.
- toolchain/linux_trampolines/clang_trampoline_linux.sh to
see that IWYU now doesn't return an error code if all the
compilation checks out, so we had to add --error to specify
the return code we wanted on an IWYU violation (3, chosen
arbitrarily).
- Rest of toolchain/ to see changes necessary for new file
names and locations.
- All the rest of the .cpp and .h files which were what the
new IWYU said they should be (e.g. changes to enum classes).
We intentionally had SkSpan export <type_traits> because
IWYU doesn't handle the std::remove_pointer_t in the template
cleanly.
Change-Id: I5179bd78a9683d98e46d649284c154db4d3c7d13
Bug: skia:12541
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/594807
Owners-Override: Kevin Lubick <[email protected]>
Reviewed-by: Ben Wagner <[email protected]>
diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index ae6e79d..11b45e1 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -20,6 +20,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
#include "include/private/SkMalloc.h"
+#include "include/private/SkTemplates.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkAAClip.h"
#include "src/core/SkMask.h"
diff --git a/tests/BackendAllocationTest.cpp b/tests/BackendAllocationTest.cpp
index fbbcc4a..f9e8fde 100644
--- a/tests/BackendAllocationTest.cpp
+++ b/tests/BackendAllocationTest.cpp
@@ -15,6 +15,7 @@
#include "include/core/SkPixmap.h"
#include "include/core/SkRect.h"
#include "include/core/SkRefCnt.h"
+#include "include/core/SkSamplingOptions.h"
#include "include/core/SkString.h"
#include "include/core/SkSurface.h"
#include "include/core/SkTypes.h"
diff --git a/tests/BazelTestRunner.cpp b/tests/BazelTestRunner.cpp
index 9552712..b56edfc 100644
--- a/tests/BazelTestRunner.cpp
+++ b/tests/BazelTestRunner.cpp
@@ -12,7 +12,6 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "tests/Test.h"
-#include "tools/Registry.h"
#include "tests/TestHarness.h"
diff --git a/tests/BulkRectTest.cpp b/tests/BulkRectTest.cpp
index c50634c..73927ac5 100644
--- a/tests/BulkRectTest.cpp
+++ b/tests/BulkRectTest.cpp
@@ -12,6 +12,7 @@
#include "include/core/SkMatrix.h"
#include "include/core/SkRect.h"
#include "include/core/SkRefCnt.h"
+#include "include/core/SkSamplingOptions.h"
#include "include/core/SkSize.h"
#include "include/core/SkSurfaceProps.h"
#include "include/core/SkTypes.h"
diff --git a/tests/CanvasStateHelpers.cpp b/tests/CanvasStateHelpers.cpp
index bfafc6e..a5f1fea 100644
--- a/tests/CanvasStateHelpers.cpp
+++ b/tests/CanvasStateHelpers.cpp
@@ -12,7 +12,6 @@
#include "tests/CanvasStateHelpers.h"
#include "include/core/SkCanvas.h"
-#include "include/core/SkClipOp.h"
#include "include/core/SkColor.h"
#include "include/core/SkPaint.h"
#include "include/core/SkRect.h"
@@ -22,6 +21,8 @@
#include <memory>
+enum class SkClipOp;
+
void complex_layers_draw(SkCanvas* canvas, float left, float top,
float right, float bottom, int32_t spacer) {
SkPaint bluePaint;
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index e250ef3..09af922 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -11,7 +11,6 @@
#include "include/core/SkColor.h"
#include "include/core/SkColorFilter.h"
#include "include/core/SkColorSpace.h"
-#include "include/core/SkFlattenable.h"
#include "include/core/SkImageInfo.h"
#include "include/core/SkPaint.h"
#include "include/core/SkPoint.h"
@@ -36,6 +35,7 @@
#include <utility>
class SkArenaAlloc;
+class SkFlattenable;
struct GrContextOptions;
struct SkStageRec;
diff --git a/tests/DescriptorTest.cpp b/tests/DescriptorTest.cpp
index bed0c92..57bf9c8 100644
--- a/tests/DescriptorTest.cpp
+++ b/tests/DescriptorTest.cpp
@@ -18,7 +18,6 @@
#include <cstdint>
#include <memory>
#include <optional>
-#include <type_traits>
class SkDescriptorTestHelper {
public:
diff --git a/tests/FontMgrAndroidParserTest.cpp b/tests/FontMgrAndroidParserTest.cpp
index d9c8dd9..974d9b9 100644
--- a/tests/FontMgrAndroidParserTest.cpp
+++ b/tests/FontMgrAndroidParserTest.cpp
@@ -38,7 +38,6 @@
#include <cstdio>
#include <memory>
#include <string>
-#include <tuple>
DECLARE_bool(verboseFontMgr);
diff --git a/tests/GrClipStackTest.cpp b/tests/GrClipStackTest.cpp
index e678799..8f46c06 100644
--- a/tests/GrClipStackTest.cpp
+++ b/tests/GrClipStackTest.cpp
@@ -30,7 +30,6 @@
#include "src/gpu/ResourceKey.h"
#include "src/gpu/ganesh/ClipStack.h"
#include "src/gpu/ganesh/GrAppliedClip.h"
-#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrClip.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrPaint.h"
@@ -39,7 +38,6 @@
#include "src/gpu/ganesh/GrResourceCache.h"
#include "src/gpu/ganesh/GrScissorState.h"
#include "src/gpu/ganesh/GrWindowRectsState.h"
-#include "src/gpu/ganesh/GrXferProcessor.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/geometry/GrShape.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
@@ -54,10 +52,12 @@
#include <utility>
#include <vector>
+class GrCaps;
class GrDstProxyView;
class GrOpFlushState;
class GrRecordingContext;
class GrSurfaceProxyView;
+enum class GrXferBarrierFlags;
namespace {
diff --git a/tests/GrGlyphVectorTest.cpp b/tests/GrGlyphVectorTest.cpp
index a724036..7409456 100644
--- a/tests/GrGlyphVectorTest.cpp
+++ b/tests/GrGlyphVectorTest.cpp
@@ -26,7 +26,6 @@
#include <initializer_list>
#include <limits.h>
#include <optional>
-#include <tuple>
#include <utility>
using GlyphVector = sktext::gpu::GlyphVector;
diff --git a/tests/GrGpuBufferTest.cpp b/tests/GrGpuBufferTest.cpp
index 6215f9a..44cb6c4 100644
--- a/tests/GrGpuBufferTest.cpp
+++ b/tests/GrGpuBufferTest.cpp
@@ -31,18 +31,15 @@
#include "src/gpu/ganesh/GrOpFlushState.h"
#include "src/gpu/ganesh/GrPipeline.h"
#include "src/gpu/ganesh/GrPixmap.h"
-#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/GrProcessorAnalysis.h"
#include "src/gpu/ganesh/GrProcessorSet.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
#include "src/gpu/ganesh/GrSimpleMesh.h"
#include "src/gpu/ganesh/GrUserStencilSettings.h"
-#include "src/gpu/ganesh/GrXferProcessor.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVarying.h"
-#include "src/gpu/ganesh/ops/GrDrawOp.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
@@ -61,6 +58,7 @@
class GrRecordingContext;
class GrSurfaceProxyView;
class SkArenaAlloc;
+enum class GrXferBarrierFlags;
namespace skgpu { class KeyBuilder; }
struct GrContextOptions;
struct GrShaderCaps;
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 118e84d..b9df153 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -35,7 +35,6 @@
#include "src/gpu/ganesh/GrOpsRenderPass.h"
#include "src/gpu/ganesh/GrPipeline.h"
#include "src/gpu/ganesh/GrPixmap.h"
-#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/GrProcessorAnalysis.h"
#include "src/gpu/ganesh/GrProcessorSet.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
@@ -43,7 +42,6 @@
#include "src/gpu/ganesh/GrShaderCaps.h"
#include "src/gpu/ganesh/GrShaderVar.h"
#include "src/gpu/ganesh/GrUserStencilSettings.h"
-#include "src/gpu/ganesh/GrXferProcessor.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVarying.h"
@@ -69,6 +67,7 @@
class GrGLSLProgramDataManager;
class GrRecordingContext;
class GrSurfaceProxyView;
+enum class GrXferBarrierFlags;
struct GrContextOptions;
#if 0
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index 3cf83ec..9a627f6 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -21,7 +21,6 @@
#include "src/core/SkArenaAlloc.h"
#include "src/core/SkSLTypeShared.h"
#include "src/gpu/ganesh/GrBuffer.h"
-#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrColor.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrGeometryProcessor.h"
@@ -29,7 +28,6 @@
#include "src/gpu/ganesh/GrOpFlushState.h"
#include "src/gpu/ganesh/GrPipeline.h"
#include "src/gpu/ganesh/GrPixmap.h"
-#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/GrProcessorSet.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
#include "src/gpu/ganesh/GrResourceProvider.h"
@@ -37,7 +35,6 @@
#include "src/gpu/ganesh/GrSimpleMesh.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#include "src/gpu/ganesh/GrUserStencilSettings.h"
-#include "src/gpu/ganesh/GrXferProcessor.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVarying.h"
@@ -57,6 +54,8 @@
class GrDstProxyView;
class GrGLSLProgramDataManager;
class GrRecordingContext;
+class GrCaps;
+enum class GrXferBarrierFlags;
namespace skgpu { class KeyBuilder; }
struct GrContextOptions;
struct GrShaderCaps;
diff --git a/tests/GrStyledShapeTest.cpp b/tests/GrStyledShapeTest.cpp
index b7322b4..29f4b17 100644
--- a/tests/GrStyledShapeTest.cpp
+++ b/tests/GrStyledShapeTest.cpp
@@ -8,7 +8,6 @@
#include "include/core/SkCanvas.h"
#include "include/core/SkClipOp.h"
#include "include/core/SkColor.h"
-#include "include/core/SkFlattenable.h"
#include "include/core/SkImageInfo.h"
#include "include/core/SkMatrix.h"
#include "include/core/SkPaint.h"
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index b6524d9..700e65e 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -16,6 +16,7 @@
#include "include/core/SkPixmap.h"
#include "include/core/SkRect.h"
#include "include/core/SkRefCnt.h"
+#include "include/core/SkSamplingOptions.h"
#include "include/core/SkSize.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
diff --git a/tests/GrThreadSafeCacheTest.cpp b/tests/GrThreadSafeCacheTest.cpp
index 17790d9..d6bfbd9 100644
--- a/tests/GrThreadSafeCacheTest.cpp
+++ b/tests/GrThreadSafeCacheTest.cpp
@@ -21,6 +21,7 @@
#include "include/core/SkPoint.h"
#include "include/core/SkRect.h"
#include "include/core/SkRefCnt.h"
+#include "include/core/SkSamplingOptions.h"
#include "include/core/SkSurface.h"
#include "include/core/SkSurfaceCharacterization.h"
#include "include/core/SkSurfaceProps.h"
@@ -60,7 +61,6 @@
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
#include "src/gpu/ganesh/GrThreadSafeCache.h"
-#include "src/gpu/ganesh/GrXferProcessor.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
#include "src/gpu/ganesh/ops/GrOp.h"
@@ -75,13 +75,13 @@
#include <functional>
#include <memory>
#include <thread>
-#include <tuple>
#include <utility>
class GrDstProxyView;
class GrProgramInfo;
class GrThreadSafeVertexTestOp;
class SkArenaAlloc;
+enum class GrXferBarrierFlags;
struct GrContextOptions;
static constexpr int kImageWH = 32;
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 050de12..e22ba96 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -58,7 +58,6 @@
#include <algorithm>
#include <cstdint>
#include <string>
-#include <tuple>
#include <utility>
class SkReadBuffer;
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 25f2511..eb52bb3 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -53,7 +53,6 @@
#include "src/gpu/ganesh/GrGpu.h"
#include "src/gpu/ganesh/GrImageContextPriv.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
-#include "src/gpu/ganesh/GrSurfaceProxy.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
#include "src/image/SkImage_Base.h"
diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp
index 3b524d5..d43cf11 100644
--- a/tests/LazyProxyTest.cpp
+++ b/tests/LazyProxyTest.cpp
@@ -29,7 +29,6 @@
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrOnFlushResourceProvider.h"
-#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/GrProcessorSet.h"
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
@@ -39,7 +38,6 @@
#include "src/gpu/ganesh/GrSurfaceProxyPriv.h"
#include "src/gpu/ganesh/GrTexture.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
-#include "src/gpu/ganesh/GrXferProcessor.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/ops/GrDrawOp.h"
@@ -55,6 +53,7 @@
class GrDstProxyView;
class GrOpFlushState;
class GrSurfaceProxyView;
+enum class GrXferBarrierFlags;
namespace skgpu { class KeyBuilder; }
struct GrShaderCaps;
diff --git a/tests/MeshTest.cpp b/tests/MeshTest.cpp
index 19427b8..8a1fead 100644
--- a/tests/MeshTest.cpp
+++ b/tests/MeshTest.cpp
@@ -10,7 +10,6 @@
#include "include/core/SkSpan.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/effects/SkRuntimeEffect.h"
#include "src/core/SkMeshPriv.h"
#include "src/core/SkZip.h"
#include "tests/Test.h"
diff --git a/tests/OpChainTest.cpp b/tests/OpChainTest.cpp
index 06a68ac..de26f03 100644
--- a/tests/OpChainTest.cpp
+++ b/tests/OpChainTest.cpp
@@ -27,7 +27,6 @@
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
#include "src/gpu/ganesh/GrTextureResolveManager.h"
-#include "src/gpu/ganesh/GrXferProcessor.h"
#include "src/gpu/ganesh/ops/GrOp.h"
#include "src/gpu/ganesh/ops/OpsTask.h"
#include "tests/CtsEnforcement.h"
@@ -39,7 +38,6 @@
#include <cstddef>
#include <cstdint>
#include <iterator>
-#include <memory>
#include <utility>
#include <vector>
@@ -48,6 +46,7 @@
class GrDstProxyView;
class GrRecordingContext;
class SkArenaAlloc;
+enum class GrXferBarrierFlags;
struct GrContextOptions;
// We create Ops that write a value into a range of a buffer. We create ranges from
diff --git a/tests/PDFDocumentTest.cpp b/tests/PDFDocumentTest.cpp
index af9d8cc..cffd5bb 100644
--- a/tests/PDFDocumentTest.cpp
+++ b/tests/PDFDocumentTest.cpp
@@ -16,7 +16,6 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkStream.h"
#include "include/core/SkString.h"
-#include "include/core/SkTime.h"
#include "include/docs/SkPDFDocument.h"
#include "src/utils/SkOSPath.h"
#include "tests/Test.h"
diff --git a/tests/PathBuilderTest.cpp b/tests/PathBuilderTest.cpp
index 441ebac..56e4cd6 100644
--- a/tests/PathBuilderTest.cpp
+++ b/tests/PathBuilderTest.cpp
@@ -11,7 +11,6 @@
#include "include/core/SkPoint.h"
#include "include/core/SkRRect.h"
#include "include/core/SkRect.h"
-#include "include/private/SkPathRef.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkPathPriv.h"
#include "tests/Test.h"
@@ -21,6 +20,8 @@
#include <initializer_list>
#include <vector>
+enum class SkPathConvexity;
+
static void is_empty(skiatest::Reporter* reporter, const SkPath& p) {
REPORTER_ASSERT(reporter, p.getBounds().isEmpty());
REPORTER_ASSERT(reporter, p.countPoints() == 0);
diff --git a/tests/PathOpsBattles.cpp b/tests/PathOpsBattles.cpp
index cb54d4e..9231b84 100644
--- a/tests/PathOpsBattles.cpp
+++ b/tests/PathOpsBattles.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "include/core/SkPath.h"
-#include "include/core/SkPathTypes.h"
#include "include/pathops/SkPathOps.h"
#include "include/private/SkFloatBits.h"
#include "tests/PathOpsExtendedTest.h"
@@ -14,6 +13,8 @@
#include <cstddef>
#include <iterator>
+enum class SkPathFillType;
+
#define TEST(name) { name, #name }
static void issue414409(skiatest::Reporter* reporter, const char* filename) {
diff --git a/tests/PathOpsBuildUseTest.cpp b/tests/PathOpsBuildUseTest.cpp
index 47a376f..055ce38 100644
--- a/tests/PathOpsBuildUseTest.cpp
+++ b/tests/PathOpsBuildUseTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "include/core/SkPath.h"
-#include "include/core/SkPathTypes.h"
#include "include/pathops/SkPathOps.h"
#include "include/private/SkFloatBits.h"
#include "tests/PathOpsExtendedTest.h"
@@ -14,6 +13,8 @@
#include <cstddef>
#include <iterator>
+enum class SkPathFillType;
+
#define TEST(name) { name, #name }
static void build1_1(skiatest::Reporter* reporter, const char* filename) {
diff --git a/tests/PathOpsFuzz763Test.cpp b/tests/PathOpsFuzz763Test.cpp
index 38cf3c3..3527a9b 100644
--- a/tests/PathOpsFuzz763Test.cpp
+++ b/tests/PathOpsFuzz763Test.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "include/core/SkPath.h"
-#include "include/core/SkPathTypes.h"
#include "include/pathops/SkPathOps.h"
#include "include/private/SkFloatBits.h"
#include "src/pathops/SkPathOpsTypes.h"
@@ -15,6 +14,7 @@
#include <cstddef>
#include <iterator>
+enum class SkPathFillType;
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsThreadedCommon.h b/tests/PathOpsThreadedCommon.h
index 9990634..7bf946a 100644
--- a/tests/PathOpsThreadedCommon.h
+++ b/tests/PathOpsThreadedCommon.h
@@ -8,7 +8,6 @@
#define PathOpsThreadedCommon_DEFINED
#include "include/core/SkBitmap.h"
-#include "include/core/SkPathTypes.h"
#include "include/core/SkTypes.h"
#include "include/pathops/SkPathOps.h"
#include "include/private/SkTDArray.h"
@@ -18,6 +17,7 @@
#define PATH_STR_SIZE 512
class PathOpsThreadedRunnable;
+enum class SkPathFillType;
namespace skiatest {
class Reporter;
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 11df7ff..15756a2 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -27,14 +27,11 @@
#include "src/gpu/ganesh/GrOpFlushState.h"
#include "src/gpu/ganesh/GrPaint.h"
#include "src/gpu/ganesh/GrPipeline.h"
-#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/GrProcessorSet.h"
#include "src/gpu/ganesh/GrProgramInfo.h"
-#include "src/gpu/ganesh/GrXferProcessor.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLVarying.h"
-#include "src/gpu/ganesh/ops/GrDrawOp.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrOp.h"
#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h"
@@ -50,6 +47,7 @@
class GrMeshDrawTarget;
class GrRecordingContext;
class GrSurfaceProxyView;
+enum class GrXferBarrierFlags;
struct GrContextOptions;
struct GrShaderCaps;
struct GrSimpleMesh;
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index 2b78d64..89cf9b8 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -34,7 +34,6 @@
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrImageInfo.h"
#include "src/gpu/ganesh/GrPixmap.h"
-#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/GrProcessorAnalysis.h"
#include "src/gpu/ganesh/GrProcessorSet.h"
#include "src/gpu/ganesh/GrProcessorUnitTest.h"
@@ -43,13 +42,11 @@
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#include "src/gpu/ganesh/GrTextureProxy.h"
#include "src/gpu/ganesh/GrUserStencilSettings.h"
-#include "src/gpu/ganesh/GrXferProcessor.h"
#include "src/gpu/ganesh/SkGr.h"
#include "src/gpu/ganesh/SurfaceContext.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/effects/GrTextureEffect.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
-#include "src/gpu/ganesh/ops/GrDrawOp.h"
#include "src/gpu/ganesh/ops/GrMeshDrawOp.h"
#include "src/gpu/ganesh/ops/GrOp.h"
#include "tests/CtsEnforcement.h"
@@ -77,6 +74,7 @@
class GrRecordingContext;
class GrResourceProvider;
class SkArenaAlloc;
+enum class GrXferBarrierFlags;
struct GrContextOptions;
struct GrShaderCaps;
diff --git a/tests/ProgramsTest.cpp b/tests/ProgramsTest.cpp
index d0dc151..fb676f8 100644
--- a/tests/ProgramsTest.cpp
+++ b/tests/ProgramsTest.cpp
@@ -30,7 +30,6 @@
#include "src/gpu/ganesh/GrDrawingManager.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrPaint.h"
-#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/GrProcessorUnitTest.h"
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrSurfaceProxy.h"
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 8d9633e..154ae9d 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -20,7 +20,6 @@
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrGpu.h"
-#include "src/gpu/ganesh/GrGpuResource.h"
#include "src/gpu/ganesh/GrProxyProvider.h"
#include "src/gpu/ganesh/GrRenderTarget.h"
#include "src/gpu/ganesh/GrRenderTargetProxy.h"
diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp
index 672395b..4812a22 100644
--- a/tests/RectangleTextureTest.cpp
+++ b/tests/RectangleTextureTest.cpp
@@ -17,6 +17,7 @@
#include "include/core/SkPixmap.h"
#include "include/core/SkRect.h"
#include "include/core/SkRefCnt.h"
+#include "include/core/SkSamplingOptions.h"
#include "include/core/SkTypes.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrDirectContext.h"
diff --git a/tests/ResourceAllocatorTest.cpp b/tests/ResourceAllocatorTest.cpp
index 88d0746..778b075 100644
--- a/tests/ResourceAllocatorTest.cpp
+++ b/tests/ResourceAllocatorTest.cpp
@@ -39,7 +39,6 @@
#include <array>
#include <cstddef>
#include <functional>
-#include <type_traits>
#include <utility>
class GrRecordingContext;
diff --git a/tests/SkSLCross.cpp b/tests/SkSLCross.cpp
index 0b592dc..59c327d 100644
--- a/tests/SkSLCross.cpp
+++ b/tests/SkSLCross.cpp
@@ -24,7 +24,6 @@
#include "src/gpu/ganesh/GrImageInfo.h"
#include "src/gpu/ganesh/GrPaint.h"
#include "src/gpu/ganesh/GrPixmap.h"
-#include "src/gpu/ganesh/GrProcessor.h"
#include "src/gpu/ganesh/SurfaceDrawContext.h"
#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h"
diff --git a/tests/SkVMDebugTracePlayerTest.cpp b/tests/SkVMDebugTracePlayerTest.cpp
index 6f368d3..964e040 100644
--- a/tests/SkVMDebugTracePlayerTest.cpp
+++ b/tests/SkVMDebugTracePlayerTest.cpp
@@ -6,6 +6,7 @@
*/
#include "include/core/SkRefCnt.h"
+#include "include/core/SkSpan.h"
#include "include/private/SkSLProgramKind.h"
#include "src/core/SkVM.h"
#include "src/sksl/SkSLCompiler.h"
diff --git a/tests/SkVMTest.cpp b/tests/SkVMTest.cpp
index 78fca87..2a19616 100644
--- a/tests/SkVMTest.cpp
+++ b/tests/SkVMTest.cpp
@@ -9,6 +9,7 @@
#include "include/core/SkData.h"
#include "include/core/SkRefCnt.h"
#include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
#include "include/core/SkStream.h"
#include "include/core/SkTypes.h"
#include "include/private/SkFloatingPoint.h"
diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index 4d16192..f7f158d 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -32,7 +32,6 @@
#include "tests/CtsEnforcement.h"
#include "tests/Test.h"
-#include <tuple>
#include <utility>
class GrRecordingContext;
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index 42683d7..60bf22c 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <climits>
-#include <cstddef>
#include <cstdint>
#include <cstdio>
#include <functional>
diff --git a/tests/StrikeForGPUTest.cpp b/tests/StrikeForGPUTest.cpp
index 73a8edb..8024e2e 100644
--- a/tests/StrikeForGPUTest.cpp
+++ b/tests/StrikeForGPUTest.cpp
@@ -18,7 +18,6 @@
#include <cstdint>
#include <memory>
#include <optional>
-#include <type_traits>
#include <utility>
using namespace sktext;
diff --git a/tests/SurfaceSemaphoreTest.cpp b/tests/SurfaceSemaphoreTest.cpp
index 6e3e70e..1940909 100644
--- a/tests/SurfaceSemaphoreTest.cpp
+++ b/tests/SurfaceSemaphoreTest.cpp
@@ -34,7 +34,6 @@
#include <cstdint>
#include <initializer_list>
-
#ifdef SK_GL
#include "include/gpu/gl/GrGLFunctions.h"
#include "include/gpu/gl/GrGLInterface.h"
@@ -47,10 +46,11 @@
#include "src/gpu/ganesh/vk/GrVkCommandPool.h"
#include "src/gpu/ganesh/vk/GrVkGpu.h"
#include "src/gpu/ganesh/vk/GrVkUtil.h"
-#include "src/gpu/vk/VulkanInterface.h"
#include <vulkan/vulkan_core.h>
+namespace skgpu { struct VulkanInterface; }
+
#ifdef VK_USE_PLATFORM_WIN32_KHR
// windows wants to define this as CreateSemaphoreA or CreateSemaphoreW
#undef CreateSemaphore
diff --git a/tests/TArrayTest.cpp b/tests/TArrayTest.cpp
index 75d8bd3..311f69e 100644
--- a/tests/TArrayTest.cpp
+++ b/tests/TArrayTest.cpp
@@ -12,7 +12,6 @@
#include <array>
#include <cstdint>
#include <initializer_list>
-#include <type_traits>
#include <utility>
// This class is used to test SkTArray's behavior with classes containing a vtable.
diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp
index c7d7103..e4d59c5 100644
--- a/tests/TestUtils.cpp
+++ b/tests/TestUtils.cpp
@@ -21,6 +21,7 @@
#include "include/gpu/GrRecordingContext.h"
#include "include/private/SkTemplates.h"
#include "include/private/SkTo.h"
+#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "include/utils/SkBase64.h"
#include "src/core/SkAutoPixmapStorage.h"
#include "src/gpu/ganesh/GrCaps.h"
diff --git a/tests/TestUtils.h b/tests/TestUtils.h
index 97ff38e..e987954 100644
--- a/tests/TestUtils.h
+++ b/tests/TestUtils.h
@@ -12,7 +12,6 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkTypes.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrImageInfo.h"
#include "src/gpu/ganesh/GrPixmap.h"
@@ -26,6 +25,7 @@
class SkBitmap;
class SkPixmap;
class SkString;
+enum class GrColorType;
namespace skiatest { class Reporter; }
namespace skgpu::v1 { class SurfaceContext; }
typedef uint32_t GrColor;
diff --git a/tests/TextureOpTest.cpp b/tests/TextureOpTest.cpp
index 252a8a2..a47a4e1 100644
--- a/tests/TextureOpTest.cpp
+++ b/tests/TextureOpTest.cpp
@@ -10,6 +10,7 @@
#include "include/core/SkMatrix.h"
#include "include/core/SkRect.h"
#include "include/core/SkRefCnt.h"
+#include "include/core/SkSamplingOptions.h"
#include "include/core/SkSize.h"
#include "include/core/SkTypes.h"
#include "include/gpu/GrBackendSurface.h"
diff --git a/tests/VkBackendSurfaceTest.cpp b/tests/VkBackendSurfaceTest.cpp
index b0cb997..0ff517e 100644
--- a/tests/VkBackendSurfaceTest.cpp
+++ b/tests/VkBackendSurfaceTest.cpp
@@ -32,8 +32,9 @@
#include "tests/Test.h"
#include "tools/gpu/ManagedBackendTexture.h"
#include "tools/gpu/ProxyUtils.h"
+
#include <vulkan/vulkan_core.h>
-#include <tuple>
+
class GrTexture;
struct GrContextOptions;
diff --git a/tests/VkDrawableTest.cpp b/tests/VkDrawableTest.cpp
index a0a9a2a..887f13b 100644
--- a/tests/VkDrawableTest.cpp
+++ b/tests/VkDrawableTest.cpp
@@ -32,7 +32,6 @@
#include "src/gpu/ganesh/vk/GrVkGpu.h"
#include "src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h"
#include "src/gpu/ganesh/vk/GrVkUtil.h"
-#include "src/gpu/vk/VulkanInterface.h"
#include "tests/CtsEnforcement.h"
#include "tests/Test.h"
@@ -42,6 +41,8 @@
struct GrContextOptions;
+namespace skgpu { struct VulkanInterface; }
+
using sk_gpu_test::GrContextFactory;
static const int DEV_W = 16, DEV_H = 16;
diff --git a/tests/WrappedSurfaceCopyOnWriteTest.cpp b/tests/WrappedSurfaceCopyOnWriteTest.cpp
index f7b39d0..99629bd 100644
--- a/tests/WrappedSurfaceCopyOnWriteTest.cpp
+++ b/tests/WrappedSurfaceCopyOnWriteTest.cpp
@@ -15,6 +15,7 @@
#include "include/core/SkImageInfo.h"
#include "include/core/SkRect.h"
#include "include/core/SkRefCnt.h"
+#include "include/core/SkSamplingOptions.h"
#include "include/core/SkSurface.h"
#include "include/core/SkSurfaceCharacterization.h"
#include "include/core/SkTypes.h"
