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/gpu | |
| 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/gpu')
| -rw-r--r-- | include/gpu/GrContext.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 517e23a627..5a2ba4780f 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -33,7 +33,6 @@ class GrGlyphCache; class GrGpu; class GrIndexBuffer; struct GrMockOptions; -class GrOpMemoryPool; class GrOvalRenderer; class GrPath; class GrProxyProvider; @@ -308,8 +307,6 @@ private: GrProxyProvider* fProxyProvider; std::unique_ptr<GrTextureStripAtlasManager> fTextureStripAtlasManager; - // All the GrOp-derived classes use this pool. - sk_sp<GrOpMemoryPool> fOpMemoryPool; GrGlyphCache* fGlyphCache; std::unique_ptr<GrTextBlobCache> fTextBlobCache; |