diff options
author | 2017-05-04 14:15:40 -0400 | |
---|---|---|
committer | 2017-05-05 14:06:08 +0000 | |
commit | ce78bad054060c5fac3bd216ee437f6fe34df8b7 (patch) | |
tree | ca4f9bb00056b8dd9ff2ed0594c7febe788f7db3 /src | |
parent | 209e4b1b70a5e9c2f504de15f038999ed9ee4ae5 (diff) |
header cleanup
Change-Id: I9d93add4e7998d8a1aa37cba9e7829fcbda867d5
Reviewed-on: https://skia-review.googlesource.com/15318
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/GrProcessorSet.h | 2 | ||||
-rw-r--r-- | src/gpu/GrXferProcessor.h | 5 | ||||
-rw-r--r-- | src/gpu/ops/GrClearStencilClipOp.h | 1 | ||||
-rw-r--r-- | src/gpu/ops/GrDiscardOp.h | 1 | ||||
-rw-r--r-- | src/gpu/ops/GrStencilPathOp.h | 1 | ||||
-rw-r--r-- | src/sksl/ir/SkSLPrefixExpression.h | 2 | ||||
-rw-r--r-- | src/sksl/ir/SkSLSwizzle.h | 2 | ||||
-rw-r--r-- | src/sksl/ir/SkSLVariableReference.h | 2 |
8 files changed, 13 insertions, 3 deletions
diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h index 56cbee1cac..b15da1e3f7 100644 --- a/src/gpu/GrProcessorSet.h +++ b/src/gpu/GrProcessorSet.h @@ -12,9 +12,9 @@ #include "GrPaint.h" #include "GrProcessorAnalysis.h" #include "SkTemplates.h" +#include "GrXferProcessor.h" class GrAppliedClip; -class GrXferProcessor; class GrXPFactory; class GrProcessorSet : private SkNoncopyable { diff --git a/src/gpu/GrXferProcessor.h b/src/gpu/GrXferProcessor.h index 3aecf3e686..a739c8b29e 100644 --- a/src/gpu/GrXferProcessor.h +++ b/src/gpu/GrXferProcessor.h @@ -12,12 +12,13 @@ #include "GrColor.h" #include "GrNonAtomicRef.h" #include "GrProcessor.h" -#include "GrProcessorSet.h" +#include "GrProcessorAnalysis.h" #include "GrTexture.h" #include "GrTypes.h" -class GrShaderCaps; class GrGLSLXferProcessor; +class GrProcessorSet; +class GrShaderCaps; /** * Barriers for blending. When a shader reads the dst directly, an Xfer barrier is sometimes diff --git a/src/gpu/ops/GrClearStencilClipOp.h b/src/gpu/ops/GrClearStencilClipOp.h index 1b7d103998..9de97db02d 100644 --- a/src/gpu/ops/GrClearStencilClipOp.h +++ b/src/gpu/ops/GrClearStencilClipOp.h @@ -14,6 +14,7 @@ #include "GrOp.h" #include "GrOpFlushState.h" #include "GrRenderTarget.h" +#include "GrRenderTargetContext.h" class GrClearStencilClipOp final : public GrOp { public: diff --git a/src/gpu/ops/GrDiscardOp.h b/src/gpu/ops/GrDiscardOp.h index 5640f308ac..dd5c4ef189 100644 --- a/src/gpu/ops/GrDiscardOp.h +++ b/src/gpu/ops/GrDiscardOp.h @@ -12,6 +12,7 @@ #include "GrOp.h" #include "GrOpFlushState.h" #include "GrRenderTarget.h" +#include "GrRenderTargetContext.h" class GrDiscardOp final : public GrOp { public: diff --git a/src/gpu/ops/GrStencilPathOp.h b/src/gpu/ops/GrStencilPathOp.h index 93357f74fc..f9a41ec7ad 100644 --- a/src/gpu/ops/GrStencilPathOp.h +++ b/src/gpu/ops/GrStencilPathOp.h @@ -14,6 +14,7 @@ #include "GrPath.h" #include "GrPathRendering.h" #include "GrRenderTarget.h" +#include "GrRenderTargetContext.h" #include "GrStencilSettings.h" class GrStencilPathOp final : public GrOp { diff --git a/src/sksl/ir/SkSLPrefixExpression.h b/src/sksl/ir/SkSLPrefixExpression.h index a61ff65bd6..acab37ed88 100644 --- a/src/sksl/ir/SkSLPrefixExpression.h +++ b/src/sksl/ir/SkSLPrefixExpression.h @@ -9,6 +9,8 @@ #define SKSL_PREFIXEXPRESSION #include "SkSLExpression.h" +#include "SkSLFloatLiteral.h" +#include "SkSLIRGenerator.h" #include "SkSLToken.h" namespace SkSL { diff --git a/src/sksl/ir/SkSLSwizzle.h b/src/sksl/ir/SkSLSwizzle.h index dedb81c01d..1e36c41e41 100644 --- a/src/sksl/ir/SkSLSwizzle.h +++ b/src/sksl/ir/SkSLSwizzle.h @@ -8,8 +8,10 @@ #ifndef SKSL_SWIZZLE #define SKSL_SWIZZLE +#include "SkSLConstructor.h" #include "SkSLContext.h" #include "SkSLExpression.h" +#include "SkSLIRGenerator.h" #include "SkSLUtil.h" namespace SkSL { diff --git a/src/sksl/ir/SkSLVariableReference.h b/src/sksl/ir/SkSLVariableReference.h index 3b8ebe3617..92aef94290 100644 --- a/src/sksl/ir/SkSLVariableReference.h +++ b/src/sksl/ir/SkSLVariableReference.h @@ -8,6 +8,8 @@ #ifndef SKSL_VARIABLEREFERENCE #define SKSL_VARIABLEREFERENCE +#include "SkSLBoolLiteral.h" +#include "SkSLConstructor.h" #include "SkSLExpression.h" #include "SkSLFloatLiteral.h" #include "SkSLIRGenerator.h" |