diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-06-12 08:13:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-12 15:59:47 +0000 |
| commit | db4062038cc0e1b78795b840fa82a4be5705e0e2 (patch) | |
| tree | 7f7b9c08376312141151b4226ff8fefc7cba1d12 /src | |
| parent | c9c06d45863e64ae99ef54c8c56014c855f1ca65 (diff) | |
Re-enable deferred proxies in Chrome
Change-Id: I6dad0c1d3ff9f81e13625988b00c3f844128d7e7
Reviewed-on: https://skia-review.googlesource.com/19446
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrSurfaceProxy.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp index 53529c2e3b..66deb77651 100644 --- a/src/gpu/GrSurfaceProxy.cpp +++ b/src/gpu/GrSurfaceProxy.cpp @@ -168,21 +168,6 @@ sk_sp<GrTextureProxy> GrSurfaceProxy::MakeDeferred(GrResourceProvider* resourceP GrSurfaceDesc copyDesc = desc; copyDesc.fSampleCnt = SkTMin(desc.fSampleCnt, caps->maxSampleCount()); -#ifdef SK_DISABLE_DEFERRED_PROXIES - sk_sp<GrTexture> tex; - - if (SkBackingFit::kApprox == fit) { - tex = resourceProvider->createApproxTexture(copyDesc, flags); - } else { - tex = resourceProvider->createTexture(copyDesc, budgeted, flags); - } - - if (!tex) { - return nullptr; - } - - return GrSurfaceProxy::MakeWrapped(std::move(tex)); -#else if (willBeRT) { // We know anything we instantiate later from this deferred path will be // both texturable and renderable @@ -191,7 +176,6 @@ sk_sp<GrTextureProxy> GrSurfaceProxy::MakeDeferred(GrResourceProvider* resourceP } return sk_sp<GrTextureProxy>(new GrTextureProxy(copyDesc, fit, budgeted, nullptr, 0, flags)); -#endif } sk_sp<GrTextureProxy> GrSurfaceProxy::MakeDeferred(GrResourceProvider* resourceProvider, |