diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/VisualBench/WrappedBenchmark.h | 14 | ||||
| -rw-r--r-- | tools/debugger/SkDebugCanvas.cpp | 9 |
2 files changed, 12 insertions, 11 deletions
diff --git a/tools/VisualBench/WrappedBenchmark.h b/tools/VisualBench/WrappedBenchmark.h index ddf601ddf8..8939fda319 100644 --- a/tools/VisualBench/WrappedBenchmark.h +++ b/tools/VisualBench/WrappedBenchmark.h @@ -11,6 +11,7 @@ #include "Benchmark.h" #include "SkSurface.h" #include "GrContext.h" +#include "GrDrawContext.h" #include "GrRenderTarget.h" // Wrap some other benchmark to allow specialization to either @@ -112,15 +113,18 @@ private: void onBlitToScreen(SkCanvas* canvas, int w, int h) override { // We call copySurface directly on the underlying GPU surfaces for a more efficient blit. - GrRenderTarget* dst = canvas->internal_private_accessTopLayerRenderTarget(); - SkASSERT(dst); + GrDrawContext* dstDC = canvas->internal_private_accessTopLayerDrawContext(); + SkASSERT(dstDC); - GrRenderTarget* src = fOffScreen->getCanvas()->internal_private_accessTopLayerRenderTarget(); + GrDrawContext* srcDC = + fOffScreen->getCanvas()->internal_private_accessTopLayerDrawContext(); + SkASSERT(srcDC); + GrRenderTarget* src = srcDC->accessRenderTarget(); SkASSERT(src); - SkASSERT(dst->getContext() == src->getContext()); + SkASSERT(canvas->getGrContext() == fOffScreen->getCanvas()->getGrContext()); - dst->getContext()->copySurface(dst, src, SkIRect::MakeWH(w, h), SkIPoint::Make(0, 0)); + dstDC->copySurface(src, SkIRect::MakeWH(w, h), SkIPoint::Make(0, 0)); } int fNumSamples; diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp index 8568029d38..5ee22eba3f 100644 --- a/tools/debugger/SkDebugCanvas.cpp +++ b/tools/debugger/SkDebugCanvas.cpp @@ -418,12 +418,9 @@ SkTDArray <SkDrawCommand*>& SkDebugCanvas::getDrawCommands() { GrAuditTrail* SkDebugCanvas::getAuditTrail(SkCanvas* canvas) { GrAuditTrail* at = nullptr; #if SK_SUPPORT_GPU - GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); - if (rt) { - GrContext* ctx = rt->getContext(); - if (ctx) { - at = ctx->getAuditTrail(); - } + GrContext* ctx = canvas->getGrContext(); + if (ctx) { + at = ctx->getAuditTrail(); } #endif return at; |