diff options
author | Robert Phillips <robertphillips@google.com> | 2018-06-15 15:59:38 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-15 15:59:45 +0000 |
commit | 4f6ba2e522bcc3f84c02c9b7dd834b9b5476968b (patch) | |
tree | 790f98d53f60cdef293fa2788ac02ec4722c33c1 /include/private/GrOpList.h | |
parent | 0513dd8675534afdd605cea32778a4b4671b2c3d (diff) |
Revert "Move op memory storage to GrContext"
This reverts commit c8cee446bf9c07da8848bbd032abf26e79966ac1.
Reason for revert: TSAN issues
Original change's description:
> Move op memory storage to GrContext
>
> TBR=bsalomon@google.com
> Change-Id: Ifa95bf0073b9d948f2c937d10088b7734b971f90
> Reviewed-on: https://skia-review.googlesource.com/131500
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: Ia0d2b7408314d9b67d57388315376bbea23d3780
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/135181
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/private/GrOpList.h')
-rw-r--r-- | include/private/GrOpList.h | 17 |
1 files changed, 6 insertions, 11 deletions
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; |