From 3f9797d2a52d2f4a0c1d7b3ba1a6f39df478f7ef Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Mon, 5 Feb 2018 09:56:42 -0500 Subject: 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 Commit-Queue: Greg Daniel --- src/gpu/GrProxyProvider.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/gpu/GrProxyProvider.cpp') 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 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 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 GrProxyProvider::createProxy(const GrSurfaceDesc& desc, } return sk_sp(new GrTextureProxy(copyDesc, fit, budgeted, nullptr, 0, flags)); -#endif } sk_sp GrProxyProvider::createWrappedTextureProxy( -- cgit v1.2.3