From df2bf213649e0b2bcb9402548af9976bbdf7a218 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 24 Apr 2017 08:39:40 -0400 Subject: Split up opLists (take 2) Reland of: https://skia-review.googlesource.com/c/11581/ (Split up opLists) https://skia-review.googlesource.com/c/13860/ (Make InstancedRendering more opList-splitting friendly) has landed so this should be good for another attempt. Change-Id: Icc9998196587510328e0a9ca1b2ce42013a86c6c Reviewed-on: https://skia-review.googlesource.com/13802 Reviewed-by: Brian Salomon Commit-Queue: Robert Phillips --- src/gpu/GrOpList.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'src/gpu/GrOpList.h') 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 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 fDependencies; + SkTDArray fDependencies; typedef SkRefCnt INHERITED; }; -- cgit v1.2.3