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/GrDrawingManager.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/GrDrawingManager.cpp')
| -rw-r--r-- | src/gpu/GrDrawingManager.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp index 7c6338f3d2..99eb04b918 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/GrDrawingManager.cpp @@ -10,7 +10,6 @@ #include "GrContext.h" #include "GrContextPriv.h" #include "GrGpu.h" -#include "GrMemoryPool.h" #include "GrOnFlushResourceProvider.h" #include "GrOpList.h" #include "GrRenderTargetContext.h" @@ -237,15 +236,6 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*, #endif fOpLists.reset(); -#ifdef SK_DEBUG - // In non-DDL mode this checks that all the flushed ops have been freed from the memory pool. - // When we move to partial flushes this assert will no longer be valid. - // In DDL mode this check is somewhat superfluous since the memory for most of the ops/opLists - // will be stored in the DDL's GrOpMemoryPools. - GrOpMemoryPool* opMemoryPool = fContext->contextPriv().opMemoryPool(); - opMemoryPool->isEmpty(); -#endif - GrSemaphoresSubmitted result = gpu->finishFlush(numSemaphores, backendSemaphores); flushState.uninstantiateProxyTracker()->uninstantiateAllProxies(); @@ -430,7 +420,6 @@ sk_sp<GrRenderTargetOpList> GrDrawingManager::newRTOpList(GrRenderTargetProxy* r sk_sp<GrRenderTargetOpList> opList(new GrRenderTargetOpList( resourceProvider, - fContext->contextPriv().refOpMemoryPool(), rtp, fContext->contextPriv().getAuditTrail())); SkASSERT(rtp->getLastOpList() == opList.get()); @@ -453,7 +442,6 @@ sk_sp<GrTextureOpList> GrDrawingManager::newTextureOpList(GrTextureProxy* textur } sk_sp<GrTextureOpList> opList(new GrTextureOpList(fContext->contextPriv().resourceProvider(), - fContext->contextPriv().refOpMemoryPool(), textureProxy, fContext->contextPriv().getAuditTrail())); |