aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2018-02-14 07:35:32 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-14 14:20:57 +0000
commit83373a82747ab600e91873f594cd8df65e1676a4 (patch)
tree82fe871c29ed376280abf2bb3a704b1b6ddc0d74
parent8242c5c199f5d04e4209222b265f9e27f7c55fa7 (diff)
Fix compilation of opList-based DDL implementation
Change-Id: Id8d034d85e0d4e67573ae13295fbbac634d366c3 Reviewed-on: https://skia-review.googlesource.com/107180 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
-rw-r--r--src/core/SkDeferredDisplayListRecorder.cpp26
1 files changed, 15 insertions, 11 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<GrRenderTargetProxy> proxy = proxyProvider->createLazyRenderTargetProxy(
- [ lazyProxyData ] (GrResourceProvider* resourceProvider, GrSurfaceOrigin* /* outOrigin */) {
- if (!resourceProvider) {
- return sk_sp<GrSurface>();
- }
-
- // 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<GrSurface>(lazyProxyData->fReplayDest->priv().peekSurface());
- }, desc, GrProxyProvider::Textureable(fCharacterization.isTextureable()),
- GrMipMapped::kNo, SkBackingFit::kExact, SkBudgeted::kYes);
+ [ lazyProxyData ] (GrResourceProvider* resourceProvider) {
+ if (!resourceProvider) {
+ return sk_sp<GrSurface>();
+ }
+
+ // 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<GrSurface>(lazyProxyData->fReplayDest->priv().peekSurface());
+ },
+ desc,
+ GrProxyProvider::Textureable(fCharacterization.isTextureable()),
+ GrMipMapped::kNo,
+ SkBackingFit::kExact,
+ SkBudgeted::kYes);
sk_sp<GrSurfaceContext> c = fContext->contextPriv().makeWrappedSurfaceContext(
std::move(proxy),