diff options
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/GrCCPerOpListPaths.h | 2 | ||||
-rw-r--r-- | include/private/GrOpList.h | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/include/private/GrCCPerOpListPaths.h b/include/private/GrCCPerOpListPaths.h index 6e53a1ff5c..b94e82c548 100644 --- a/include/private/GrCCPerOpListPaths.h +++ b/include/private/GrCCPerOpListPaths.h @@ -25,7 +25,7 @@ class GrCCPerOpListPaths : public SkRefCnt { public: ~GrCCPerOpListPaths(); - SkTInternalLList<GrCCDrawPathsOp> fDrawOps; // This class does not own these ops. + SkTInternalLList<GrCCDrawPathsOp> fDrawOps; std::map<uint32_t, GrCCClipPath> fClipPaths; SkSTArenaAlloc<10 * 1024> fAllocator{10 * 1024 * 2}; sk_sp<const GrCCPerFlushResources> fFlushResources; diff --git a/include/private/GrOpList.h b/include/private/GrOpList.h index 0d5a1a245a..846a5834f7 100644 --- a/include/private/GrOpList.h +++ b/include/private/GrOpList.h @@ -17,7 +17,6 @@ class GrAuditTrail; class GrCaps; class GrOpFlushState; -class GrOpMemoryPool; class GrRenderTargetOpList; class GrResourceAllocator; class GrResourceProvider; @@ -29,7 +28,7 @@ struct SkIRect; class GrOpList : public SkRefCnt { public: - GrOpList(GrResourceProvider*, sk_sp<GrOpMemoryPool>, GrSurfaceProxy*, GrAuditTrail*); + GrOpList(GrResourceProvider*, GrSurfaceProxy*, GrAuditTrail*); ~GrOpList() override; // These four methods are invoked at flush time @@ -103,16 +102,12 @@ public: protected: bool isInstantiated() const; - // This is a backpointer to the GrOpMemoryPool that holds the memory for this opLists' ops. - // In the DDL case, these back pointers keep the DDL's GrOpMemoryPool alive as long as its - // constituent opLists survive. - sk_sp<GrOpMemoryPool> fOpMemoryPool; - GrSurfaceProxyRef fTarget; - GrAuditTrail* fAuditTrail; + GrSurfaceProxyRef fTarget; + GrAuditTrail* fAuditTrail; - GrLoadOp fColorLoadOp = GrLoadOp::kLoad; - GrColor fLoadClearColor = 0x0; - GrLoadOp fStencilLoadOp = GrLoadOp::kLoad; + GrLoadOp fColorLoadOp = GrLoadOp::kLoad; + GrColor fLoadClearColor = 0x0; + GrLoadOp fStencilLoadOp = GrLoadOp::kLoad; // List of texture proxies whose contents are being prepared on a worker thread SkTArray<GrTextureProxy*, true> fDeferredProxies; |