diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-06-12 10:11:12 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-12 14:43:03 +0000 |
| commit | 7c525e62d405d57ae7a7742cf607b9770a83a0ab (patch) | |
| tree | 8dabe9ed08bddd398b8fac935decaf2743f5a6f7 /src/gpu/ccpr | |
| parent | 7deacf4833dcdb6c1101a18a2b46a8c516a96f9a (diff) | |
Plumb GrContext everywhere
There is no good way to split the monster CL up. This breaks out
the GrContext plumbing but doesn't use it.
Change-Id: I90856d428d372bcec3f8821e6364667b367927d4
Reviewed-on: https://skia-review.googlesource.com/133382
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/ccpr')
| -rw-r--r-- | src/gpu/ccpr/GrCCAtlas.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/ccpr/GrCCDrawPathsOp.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/ccpr/GrCCDrawPathsOp.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/gpu/ccpr/GrCCAtlas.cpp b/src/gpu/ccpr/GrCCAtlas.cpp index afa82c4ec7..df84ed75a4 100644 --- a/src/gpu/ccpr/GrCCAtlas.cpp +++ b/src/gpu/ccpr/GrCCAtlas.cpp @@ -8,10 +8,12 @@ #include "GrCCAtlas.h" #include "GrClip.h" +#include "GrMemoryPool.h" #include "GrOnFlushResourceProvider.h" #include "GrSurfaceContextPriv.h" #include "GrRectanizer_skyline.h" #include "GrRenderTargetContext.h" +#include "GrSurfaceContextPriv.h" #include "GrTextureProxy.h" #include "SkMakeUnique.h" #include "SkMathPriv.h" @@ -76,6 +78,8 @@ public: } private: + friend class GrOpMemoryPool; // for ctor + DrawCoverageCountOp(sk_sp<const GrCCPathParser> parser, CoverageCountBatchID batchID, const SkISize& drawBounds) : INHERITED(ClassID()) diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.cpp b/src/gpu/ccpr/GrCCDrawPathsOp.cpp index c4be7c59a5..01913fa252 100644 --- a/src/gpu/ccpr/GrCCDrawPathsOp.cpp +++ b/src/gpu/ccpr/GrCCDrawPathsOp.cpp @@ -8,6 +8,7 @@ #include "GrCCDrawPathsOp.h" #include "GrGpuCommandBuffer.h" +#include "GrMemoryPool.h" #include "GrOpFlushState.h" #include "ccpr/GrCCPerFlushResources.h" #include "ccpr/GrCoverageCountingPathRenderer.h" diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.h b/src/gpu/ccpr/GrCCDrawPathsOp.h index f43ccd0e57..303f52b529 100644 --- a/src/gpu/ccpr/GrCCDrawPathsOp.h +++ b/src/gpu/ccpr/GrCCDrawPathsOp.h @@ -53,6 +53,8 @@ public: void onExecute(GrOpFlushState*) override; private: + friend class GrOpMemoryPool; + GrCCDrawPathsOp(GrPaint&&, const SkIRect& clipIBounds, const SkMatrix&, const SkPath&, const SkRect& devBounds); |