From 4fa31782fc55c43e0ba1566034207fa18089c0e7 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 17 Jul 2018 12:27:26 +0000 Subject: Revert "Reduce arbitrary opList splitting when sorting" This reverts commit 94fee93c9b23bd1a32604753da8bef755d6c8a95. Reason for revert: Android (and Chromecast) woes Original change's description: > Reduce arbitrary opList splitting when sorting > > Change-Id: I49a47672600f72dc46f27462a2c344e77a06a659 > Reviewed-on: https://skia-review.googlesource.com/141243 > Reviewed-by: Brian Salomon > Commit-Queue: Robert Phillips TBR=bsalomon@google.com,robertphillips@google.com Change-Id: Ic4fd4ab17bb15bef35dcbf852e0f8ad99ee45e8f No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/141760 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- include/private/GrOpList.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/private/GrOpList.h b/include/private/GrOpList.h index a4e541c81d..0d5a1a245a 100644 --- a/include/private/GrOpList.h +++ b/include/private/GrOpList.h @@ -67,7 +67,15 @@ public: /* * Does this opList depend on 'dependedOn'? */ - bool dependsOn(const GrOpList* dependedOn) const; + bool dependsOn(GrOpList* dependedOn) const { + for (int i = 0; i < fDependencies.count(); ++i) { + if (fDependencies[i] == dependedOn) { + return true; + } + } + + return false; + } /* * Safely cast this GrOpList to a GrTextureOpList (if possible). @@ -112,13 +120,6 @@ protected: private: friend class GrDrawingManager; // for resetFlag, TopoSortTraits & gatherProxyIntervals - void addDependency(GrOpList* dependedOn); - void addDependent(GrOpList* dependent); - SkDEBUGCODE(bool isDependedent(const GrOpList* dependent) const); - SkDEBUGCODE(void validate() const); - - void closeThoseWhoDependOnMe(const GrCaps&); - // Remove all Ops which reference proxies that have not been instantiated. virtual void purgeOpsWithUninstantiatedProxies() = 0; @@ -173,13 +174,13 @@ private: virtual void onPrepare(GrOpFlushState* flushState) = 0; virtual bool onExecute(GrOpFlushState* flushState) = 0; + void addDependency(GrOpList* dependedOn); + uint32_t fUniqueID; uint32_t fFlags; // 'this' GrOpList relies on the output of the GrOpLists in 'fDependencies' SkSTArray<1, GrOpList*, true> fDependencies; - // 'this' GrOpList's output is relied on by the GrOpLists in 'fDependents' - SkSTArray<1, GrOpList*, true> fDependents; typedef SkRefCnt INHERITED; }; -- cgit v1.2.3