diff options
Diffstat (limited to 'src/gpu/GrOpList.h')
| -rw-r--r-- | src/gpu/GrOpList.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/gpu/GrOpList.h b/src/gpu/GrOpList.h index b7dd7fa62f..352a46c2a9 100644 --- a/src/gpu/GrOpList.h +++ b/src/gpu/GrOpList.h @@ -29,11 +29,7 @@ public: virtual bool executeOps(GrOpFlushState* flushState) = 0; virtual void makeClosed() { - // We only close GrOpLists when MDB is enabled. When MDB is disabled there is only - // ever one GrOpLists and all calls will be funnelled into it. -#ifdef ENABLE_MDB this->setFlag(kClosed_Flag); -#endif } // TODO: it seems a bit odd that GrOpList has nothing to clear on reset @@ -44,10 +40,6 @@ public: virtual void abandonGpuResources() = 0; virtual void freeGpuResources() = 0; - // TODO: this entry point is only needed in the non-MDB world. Remove when - // we make the switch to MDB - void clearTarget() { fTarget = nullptr; } - bool isClosed() const { return this->isSetFlag(kClosed_Flag); } /* @@ -82,8 +74,8 @@ public: SkDEBUGCODE(virtual void validateTargetsSingleRenderTarget() const = 0;) protected: - GrSurfaceProxy* fTarget; - GrAuditTrail* fAuditTrail; + sk_sp<GrSurfaceProxy> fTarget; + GrAuditTrail* fAuditTrail; private: friend class GrDrawingManager; // for resetFlag & TopoSortTraits @@ -135,11 +127,11 @@ private: void addDependency(GrOpList* dependedOn); - uint32_t fUniqueID; - uint32_t fFlags; + uint32_t fUniqueID; + uint32_t fFlags; // 'this' GrOpList relies on the output of the GrOpLists in 'fDependencies' - SkTDArray<GrOpList*> fDependencies; + SkTDArray<GrOpList*> fDependencies; typedef SkRefCnt INHERITED; }; |