diff options
author | robertphillips <robertphillips@google.com> | 2015-10-22 05:31:32 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-22 05:31:32 -0700 |
commit | a352b14c8796c0d01ea8581c157a52c7d00973f5 (patch) | |
tree | 405855d64f5ae97b87f8fd2f2fbcf15f4be4d581 /src/gpu/GrDrawTarget.h | |
parent | 869c5e82a725a6928a45cd1fa6945ac783b8b3d8 (diff) |
Revert of Dependencies are now added between the drawTargets in GrPipeline (patchset #6 id:120001 of https://codereview.chromium.org/1414903002/ )
Reason for revert:
Breaking bots
Original issue's description:
> Dependencies are now added between the drawTargets in GrPipeline
>
> This CL relies on https://codereview.chromium.org/1414773002/ (Add the machinery to GrDrawTarget to enable topological sorting)
>
> BUG=skia:4094
>
> Committed: https://skia.googlesource.com/skia/+/45a1c34f607a970933e5cd05e1df6cd8090db1be
>
> Committed: https://skia.googlesource.com/skia/+/869c5e82a725a6928a45cd1fa6945ac783b8b3d8
TBR=bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4094
Review URL: https://codereview.chromium.org/1417263002
Diffstat (limited to 'src/gpu/GrDrawTarget.h')
-rw-r--r-- | src/gpu/GrDrawTarget.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h index abeedd66d2..ec94da1f0e 100644 --- a/src/gpu/GrDrawTarget.h +++ b/src/gpu/GrDrawTarget.h @@ -33,8 +33,6 @@ #include "SkTypes.h" #include "SkXfermode.h" -//#define ENABLE_MDB 1 - class GrBatch; class GrBatchFlushState; class GrClip; @@ -47,7 +45,7 @@ class GrDrawTarget final : public SkRefCnt { public: // The context may not be fully constructed and should not be used during GrDrawTarget // construction. - GrDrawTarget(GrRenderTarget* rt, GrGpu* gpu, GrResourceProvider*); + GrDrawTarget(GrGpu* gpu, GrResourceProvider*); ~GrDrawTarget() override; @@ -60,10 +58,6 @@ public: } bool isClosed() const { return this->isSetFlag(kClosed_Flag); } - // TODO: this entry point is only needed in the non-MDB world. Remove when - // we make the switch to MDB - void clearRT() { fRenderTarget = nullptr; } - /* * Notify this drawTarget that it relies on the contents of 'dependedOn' */ @@ -320,7 +314,6 @@ private: // 'this' drawTarget relies on the output of the drawTargets in 'fDependencies' SkTDArray<GrDrawTarget*> fDependencies; - GrRenderTarget* fRenderTarget; typedef SkRefCnt INHERITED; }; |