diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-02-05 09:56:42 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-05 16:18:26 +0000 |
| commit | 3f9797d2a52d2f4a0c1d7b3ba1a6f39df478f7ef (patch) | |
| tree | d78eea88ce3229ab6d35b4d53d7fe87548db4929 /src/gpu/GrProxyProvider.cpp | |
| parent | 796cda11e40e160d2111f307763c87208d45fc1b (diff) | |
Remove SK_DISABLE_DEFERRED_PROXIES define through code
Bug: skia:
Change-Id: I03503dfee145f1cebf4ff73d5e5139ef17b42d85
Reviewed-on: https://skia-review.googlesource.com/103464
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrProxyProvider.cpp')
| -rw-r--r-- | src/gpu/GrProxyProvider.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp index 8410a0a882..4e37ac88e9 100644 --- a/src/gpu/GrProxyProvider.cpp +++ b/src/gpu/GrProxyProvider.cpp @@ -324,22 +324,6 @@ sk_sp<GrTextureProxy> GrProxyProvider::createProxy(const GrSurfaceDesc& desc, this->caps()->getRenderTargetSampleCount(desc.fSampleCnt, desc.fConfig); } -#ifdef SK_DISABLE_DEFERRED_PROXIES - // Temporarily force instantiation for crbug.com/769760 and crbug.com/769898 - 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), copyDesc.fOrigin); -#else if (copyDesc.fFlags & kRenderTarget_GrSurfaceFlag) { // We know anything we instantiate later from this deferred path will be // both texturable and renderable @@ -348,7 +332,6 @@ sk_sp<GrTextureProxy> GrProxyProvider::createProxy(const GrSurfaceDesc& desc, } return sk_sp<GrTextureProxy>(new GrTextureProxy(copyDesc, fit, budgeted, nullptr, 0, flags)); -#endif } sk_sp<GrTextureProxy> GrProxyProvider::createWrappedTextureProxy( |