diff options
author | Robert Phillips <robertphillips@google.com> | 2017-04-20 17:20:24 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-21 16:02:31 +0000 |
commit | 54cbcd7056a1a56946f177059b1a5537f131271a (patch) | |
tree | 8b5e8185536940d4add8a107b14f5e5338754fee | |
parent | c17dc24fa9994eacc640d3adc6633a02fd96d3fc (diff) |
Remove all headers from include/gpu/effects
TBR=bsalomon@google.com
Change-Id: I9ad2fa41262693b3a83bef625eac332eb1e71a3d
Reviewed-on: https://skia-review.googlesource.com/13988
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
-rw-r--r-- | gn/gpu.gni | 7 | ||||
-rw-r--r-- | src/gpu/effects/GrBlurredEdgeFragmentProcessor.h (renamed from include/gpu/effects/GrBlurredEdgeFragmentProcessor.h) | 0 | ||||
-rw-r--r-- | src/gpu/effects/GrConstColorProcessor.h (renamed from include/gpu/effects/GrConstColorProcessor.h) | 0 | ||||
-rw-r--r-- | src/gpu/effects/GrXfermodeFragmentProcessor.cpp | 4 | ||||
-rw-r--r-- | src/gpu/effects/GrXfermodeFragmentProcessor.h (renamed from include/gpu/effects/GrXfermodeFragmentProcessor.h) | 0 |
5 files changed, 5 insertions, 6 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index 84b9456efe..88e93396a8 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -36,10 +36,6 @@ skia_gpu_sources = [ "$_include/gpu/GrTypes.h", "$_include/gpu/GrTypesPriv.h", - "$_include/gpu/effects/GrBlurredEdgeFragmentProcessor.h", - "$_include/gpu/effects/GrConstColorProcessor.h", - "$_include/gpu/effects/GrXfermodeFragmentProcessor.h", - "$_include/gpu/gl/GrGLAssembleInterface.h", "$_include/gpu/gl/GrGLConfig.h", "$_include/gpu/gl/GrGLExtensions.h", @@ -296,9 +292,11 @@ skia_gpu_sources = [ "$_src/gpu/effects/Gr1DKernelEffect.h", "$_src/gpu/effects/GrBlurredEdgeFragmentProcessor.cpp", + "$_src/gpu/effects/GrBlurredEdgeFragmentProcessor.h", "$_src/gpu/effects/GrConfigConversionEffect.cpp", "$_src/gpu/effects/GrConfigConversionEffect.h", "$_src/gpu/effects/GrConstColorProcessor.cpp", + "$_src/gpu/effects/GrConstColorProcessor.h", "$_src/gpu/effects/GrCoverageSetOpXP.cpp", "$_src/gpu/effects/GrCoverageSetOpXP.h", "$_src/gpu/effects/GrCustomXfermode.cpp", @@ -342,6 +340,7 @@ skia_gpu_sources = [ "$_src/gpu/effects/GrTextureDomain.h", "$_src/gpu/effects/GrTextureStripAtlas.cpp", "$_src/gpu/effects/GrXfermodeFragmentProcessor.cpp", + "$_src/gpu/effects/GrXfermodeFragmentProcessor.h", "$_src/gpu/effects/GrYUVEffect.cpp", "$_src/gpu/effects/GrYUVEffect.h", diff --git a/include/gpu/effects/GrBlurredEdgeFragmentProcessor.h b/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h index d0864ed864..d0864ed864 100644 --- a/include/gpu/effects/GrBlurredEdgeFragmentProcessor.h +++ b/src/gpu/effects/GrBlurredEdgeFragmentProcessor.h diff --git a/include/gpu/effects/GrConstColorProcessor.h b/src/gpu/effects/GrConstColorProcessor.h index b543aa5069..b543aa5069 100644 --- a/include/gpu/effects/GrConstColorProcessor.h +++ b/src/gpu/effects/GrConstColorProcessor.h diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp index 9671919dec..30a9faaf08 100644 --- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp +++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "effects/GrXfermodeFragmentProcessor.h" +#include "GrXfermodeFragmentProcessor.h" +#include "GrConstColorProcessor.h" #include "GrFragmentProcessor.h" -#include "effects/GrConstColorProcessor.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLBlend.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" diff --git a/include/gpu/effects/GrXfermodeFragmentProcessor.h b/src/gpu/effects/GrXfermodeFragmentProcessor.h index edc5ae71e1..edc5ae71e1 100644 --- a/include/gpu/effects/GrXfermodeFragmentProcessor.h +++ b/src/gpu/effects/GrXfermodeFragmentProcessor.h |