diff options
| -rw-r--r-- | gn/gpu.gni | 2 | ||||
| -rw-r--r-- | include/gpu/GrContext.h | 7 | ||||
| -rw-r--r-- | src/core/SkPictureShader.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/GrPaint.h (renamed from include/gpu/GrPaint.h) | 0 | ||||
| -rw-r--r-- | src/gpu/GrSurface.cpp | 1 | ||||
| -rw-r--r-- | tests/CanvasStateTest.cpp | 1 | ||||
| -rw-r--r-- | tests/ClipStackTest.cpp | 1 | ||||
| -rw-r--r-- | tests/SpecialImageTest.cpp | 1 | ||||
| -rw-r--r-- | tests/TestUtils.cpp | 1 |
9 files changed, 12 insertions, 3 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index 59ba257404..7ef9c3adab 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -20,7 +20,6 @@ skia_gpu_sources = [ "$_include/gpu/GrExternalTextureData.h", "$_include/gpu/GrFragmentProcessor.h", "$_include/gpu/GrGpuResource.h", - "$_include/gpu/GrPaint.h", "$_include/gpu/GrProcessor.h", "$_include/gpu/GrProcessorUnitTest.h", "$_include/gpu/GrProgramElement.h", @@ -118,6 +117,7 @@ skia_gpu_sources = [ "$_src/gpu/GrOpList.cpp", "$_src/gpu/GrOpList.h", "$_src/gpu/GrPaint.cpp", + "$_src/gpu/GrPaint.h", "$_src/gpu/GrPath.cpp", "$_src/gpu/GrPath.h", "$_src/gpu/GrPathProcessor.cpp", diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 7ac5a93de5..57500cd22e 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -10,7 +10,6 @@ #include "GrCaps.h" #include "GrColor.h" -#include "GrPaint.h" #include "GrRenderTarget.h" #include "SkMatrix.h" #include "SkPathEffect.h" @@ -34,13 +33,17 @@ class GrPipelineBuilder; class GrResourceEntry; class GrResourceCache; class GrResourceProvider; +class GrSamplerParams; class GrTextBlobCache; class GrTextContext; -class GrSamplerParams; +class GrTextureProxy; class GrVertexBuffer; class GrSwizzle; class SkTraceMemoryDump; +class SkImage; +class SkSurfaceProps; + class SK_API GrContext : public SkRefCnt { public: /** diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp index 69f92ecee9..50c33a82a0 100644 --- a/src/core/SkPictureShader.cpp +++ b/src/core/SkPictureShader.cpp @@ -22,6 +22,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrCaps.h" +#include "GrFragmentProcessor.h" #endif namespace { diff --git a/include/gpu/GrPaint.h b/src/gpu/GrPaint.h index dbf75c1815..dbf75c1815 100644 --- a/include/gpu/GrPaint.h +++ b/src/gpu/GrPaint.h diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp index b292377b12..302ba43973 100644 --- a/src/gpu/GrSurface.cpp +++ b/src/gpu/GrSurface.cpp @@ -9,6 +9,7 @@ #include "GrContext.h" #include "GrOpList.h" #include "GrSurfacePriv.h" +#include "GrTexture.h" #include "SkGr.h" #include "SkMathPriv.h" diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp index 19824fa68a..73c8a0e0b9 100644 --- a/tests/CanvasStateTest.cpp +++ b/tests/CanvasStateTest.cpp @@ -12,6 +12,7 @@ #include "SkCommandLineFlags.h" #include "SkDrawFilter.h" #include "SkPaint.h" +#include "SkRegion.h" #include "SkRRect.h" #include "SkRect.h" #include "SkTLazy.h" diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index c2b72c6d94..31dffcb6c2 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -16,6 +16,7 @@ #include "GrClipStackClip.h" #include "GrReducedClip.h" #include "GrResourceCache.h" +#include "GrTextureProxy.h" typedef GrReducedClip::ElementList ElementList; typedef GrReducedClip::InitialState InitialState; #endif diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index f9a0147bd7..d6922c394c 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -18,6 +18,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrSurfaceProxy.h" +#include "GrTextureProxy.h" #include "SkGr.h" #endif diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp index 7ac18360da..63a8d94871 100644 --- a/tests/TestUtils.cpp +++ b/tests/TestUtils.cpp @@ -11,6 +11,7 @@ #include "GrSurfaceContext.h" #include "GrSurfaceProxy.h" +#include "GrTextureProxy.h" void test_read_pixels(skiatest::Reporter* reporter, GrContext* context, GrSurfaceContext* srcContext, uint32_t expectedPixelValues[], |