From 83373a82747ab600e91873f594cd8df65e1676a4 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 14 Feb 2018 07:35:32 -0500 Subject: [PATCH] Fix compilation of opList-based DDL implementation Change-Id: Id8d034d85e0d4e67573ae13295fbbac634d366c3 Reviewed-on: https://skia-review.googlesource.com/107180 Reviewed-by: Greg Daniel Commit-Queue: Robert Phillips --- src/core/SkDeferredDisplayListRecorder.cpp | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp index b3c0679724..a9dbcd45b2 100644 --- a/src/core/SkDeferredDisplayListRecorder.cpp +++ b/src/core/SkDeferredDisplayListRecorder.cpp @@ -84,17 +84,21 @@ bool SkDeferredDisplayListRecorder::init() { // DDL is being replayed into. sk_sp proxy = proxyProvider->createLazyRenderTargetProxy( - [ lazyProxyData ] (GrResourceProvider* resourceProvider, GrSurfaceOrigin* /* outOrigin */) { - if (!resourceProvider) { - return sk_sp(); - } + [ lazyProxyData ] (GrResourceProvider* resourceProvider) { + if (!resourceProvider) { + return sk_sp(); + } - // The proxy backing the destination surface had better have been instantiated - // prior to the proxy backing the DLL's surface. Steal its GrRenderTarget. - SkASSERT(lazyProxyData->fReplayDest->priv().peekSurface()); - return sk_ref_sp(lazyProxyData->fReplayDest->priv().peekSurface()); - }, desc, GrProxyProvider::Textureable(fCharacterization.isTextureable()), - GrMipMapped::kNo, SkBackingFit::kExact, SkBudgeted::kYes); + // The proxy backing the destination surface had better have been instantiated + // prior to the proxy backing the DLL's surface. Steal its GrRenderTarget. + SkASSERT(lazyProxyData->fReplayDest->priv().peekSurface()); + return sk_ref_sp(lazyProxyData->fReplayDest->priv().peekSurface()); + }, + desc, + GrProxyProvider::Textureable(fCharacterization.isTextureable()), + GrMipMapped::kNo, + SkBackingFit::kExact, + SkBudgeted::kYes); sk_sp c = fContext->contextPriv().makeWrappedSurfaceContext( std::move(proxy),