diff options
| author |  Leon Scroggins <scroggo@google.com> | 2018-01-20 17:09:02 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-20 17:09:10 +0000 |
| commit | 2914555e004676465c5255d8b42ee0d25887ac73 (patch) | |
| tree | a93a781cd867005eb72071577064667e970c8430 /src/gpu/GrDrawingManager.cpp | |
| parent | 4f7f197c09443232f02cd81f3ac7fb5a216acd05 (diff) | |
Revert "Move more internal methods from GrContext to GrContextPriv (take 2)"
This reverts commit c22e50bd317fe3658445c04e18a6e319d746c510.
Reason for revert: Speculative fix for Android roll
Original change's description:
> Move more internal methods from GrContext to GrContextPriv (take 2)
>
> Change-Id: I47108910517d61edeb52f82793d384fdb5605d45
> Reviewed-on: https://skia-review.googlesource.com/97241
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I3a77ac33c5f48529357cf9c683d5f4cacaa2379f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/97582
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/gpu/GrDrawingManager.cpp')
| -rw-r--r-- | src/gpu/GrDrawingManager.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp index 302da06c07..e25b33c7be 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/GrDrawingManager.cpp @@ -121,9 +121,8 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*, SkASSERT(result); #endif - GrGpu* gpu = fContext->contextPriv().getGpu(); - - GrOpFlushState flushState(gpu, fContext->contextPriv().resourceProvider(), + GrOpFlushState flushState(fContext->getGpu(), + fContext->contextPriv().resourceProvider(), &fTokenTracker); GrOnFlushResourceProvider onFlushProvider(this); @@ -194,7 +193,8 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*, fOpLists.reset(); - GrSemaphoresSubmitted result = gpu->finishFlush(numSemaphores, backendSemaphores); + GrSemaphoresSubmitted result = fContext->getGpu()->finishFlush(numSemaphores, + backendSemaphores); // We always have to notify the cache when it requested a flush so it can reset its state. if (flushed || type == GrResourceCache::FlushType::kCacheRequested) { @@ -299,11 +299,10 @@ GrSemaphoresSubmitted GrDrawingManager::prepareSurfaceForExternalIO( return result; } - GrGpu* gpu = fContext->contextPriv().getGpu(); GrSurface* surface = proxy->priv().peekSurface(); - if (gpu && surface->asRenderTarget()) { - gpu->resolveRenderTarget(surface->asRenderTarget(), proxy->origin()); + if (fContext->getGpu() && surface->asRenderTarget()) { + fContext->getGpu()->resolveRenderTarget(surface->asRenderTarget(), proxy->origin()); } return result; } @@ -323,11 +322,10 @@ sk_sp<GrRenderTargetOpList> GrDrawingManager::newRTOpList(GrRenderTargetProxy* r fOpLists.back()->makeClosed(*fContext->caps()); } - auto resourceProvider = fContext->contextPriv().resourceProvider(); - - sk_sp<GrRenderTargetOpList> opList(new GrRenderTargetOpList(rtp, - resourceProvider, - fContext->getAuditTrail())); + sk_sp<GrRenderTargetOpList> opList(new GrRenderTargetOpList( + rtp, + fContext->contextPriv().resourceProvider(), + fContext->getAuditTrail())); SkASSERT(rtp->getLastOpList() == opList.get()); if (managedOpList) { |