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 /src/gpu/GrContext.cpp | |
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 'src/gpu/GrContext.cpp')
-rw-r--r-- | src/gpu/GrContext.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 897f3847db..1697c07938 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -12,7 +12,6 @@ #include "GrContextPriv.h" #include "GrDrawingManager.h" #include "GrGpu.h" -#include "GrMemoryPool.h" #include "GrProxyProvider.h" #include "GrRenderTargetContext.h" #include "GrRenderTargetProxy.h" @@ -813,22 +812,6 @@ void GrContextPriv::flushSurfaceIO(GrSurfaceProxy* proxy) { //////////////////////////////////////////////////////////////////////////////// -sk_sp<GrOpMemoryPool> GrContextPriv::refOpMemoryPool() { - if (!fContext->fOpMemoryPool) { - // DDL TODO: should the size of the memory pool be decreased in DDL mode? CPU-side memory - // consumed in DDL mode vs. normal mode for a single skp might be a good metric of wasted - // memory. - fContext->fOpMemoryPool = sk_sp<GrOpMemoryPool>(new GrOpMemoryPool(16384, 16384)); - } - - SkASSERT(fContext->fOpMemoryPool); - return fContext->fOpMemoryPool; -} - -GrOpMemoryPool* GrContextPriv::opMemoryPool() { - return this->refOpMemoryPool().get(); -} - sk_sp<GrSurfaceContext> GrContextPriv::makeWrappedSurfaceContext(sk_sp<GrSurfaceProxy> proxy, sk_sp<SkColorSpace> colorSpace, const SkSurfaceProps* props) { |