diff options
| author |  robertphillips <robertphillips@google.com> | 2016-05-20 11:14:33 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-20 11:14:33 -0700 |
| commit | 87f15c8ff11ad2bfb0c6711d7837020a50fe7fb8 (patch) | |
| tree | fc3899058560ca294ba062de98c3246db3c225d2 /include/gpu | |
| parent | f2c96a2a6fa22c674083db701d15702636f9d5fc (diff) | |
Retract GrRenderTarget from GrTestTarget
Split out of: https://codereview.chromium.org/1988923002/ (Declassify GrClipMaskManager and Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=2004433002
Review-Url: https://codereview.chromium.org/2004433002
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrContext.h | 5 | ||||
| -rw-r--r-- | include/gpu/GrDrawContext.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 86c9fa925f..4e2546b6e2 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -27,7 +27,6 @@ struct GrContextOptions; class GrContextThreadSafeProxy; class GrDrawingManager; class GrDrawContext; -class GrDrawTarget; class GrFragmentProcessor; class GrGpu; class GrIndexBuffer; @@ -354,8 +353,8 @@ public: const GrResourceProvider* resourceProvider() const { return fResourceProvider; } GrResourceCache* getResourceCache() { return fResourceCache; } - // Called by tests that draw directly to the context via GrDrawTarget - void getTestTarget(GrTestTarget*, GrRenderTarget* rt); + // Called by tests that draw directly to the context via GrDrawContext + void getTestTarget(GrTestTarget*, sk_sp<GrDrawContext>); /** Reset GPU stats */ void resetGpuStats() const ; diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h index 0e7211de79..3778b72db1 100644 --- a/include/gpu/GrDrawContext.h +++ b/include/gpu/GrDrawContext.h @@ -296,6 +296,7 @@ private: friend class GrStencilAndCoverTextContext; // for access to drawBatch friend class GrDrawingManager; // for ctor friend class GrDrawContextPriv; + friend class GrTestTarget; // for access to getDrawTarget bool drawFilledDRRect(const GrClip& clip, const GrPaint& paint, |