commit 12c46296243a5a744bca5439fc85a2dee8fa6184
author Robert Phillips <robertphillips@google.com> Tue Apr 23 07:36:17 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 23 12:24:26 2019 +0000
tree ca646f72717ae388b4ce5ce99f45461b0a9a3d1d
parent 7ecad8791ff10646d05b74393f1e026e3f6aad7c

Remove the option of disabling explicit resource allocation

We're burning our boats behind us. Succeed or die trying!

Change-Id: I6a9f71b758a6ae7b090c5221ab12a5ab4d166b47
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209647
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/ops/GrCopySurfaceOp.cpp

diff --git a/src/gpu/ops/GrCopySurfaceOp.cpp b/src/gpu/ops/GrCopySurfaceOp.cpp
index 548afb9..f2a5257 100644
--- a/src/gpu/ops/GrCopySurfaceOp.cpp
+++ b/src/gpu/ops/GrCopySurfaceOp.cpp
@@ -87,11 +87,7 @@
 }
 
 void GrCopySurfaceOp::onExecute(GrOpFlushState* state, const SkRect& chainBounds) {
-    if (state->resourceProvider()->explicitlyAllocateGPUResources()) {
-        SkASSERT(fSrc.get()->isInstantiated());
-    } else if (!fSrc.get()->instantiate(state->resourceProvider())) {
-        return;
-    }
+    SkASSERT(fSrc.get()->isInstantiated());
 
     state->commandBuffer()->copy(fSrc.get()->peekSurface(), fSrc.get()->origin(), fSrcRect,
                                  fDstPoint);

src/gpu/ops/GrTextureOp.cpp

diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 554dfb8..dd6d70c 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -442,11 +442,7 @@
             for (unsigned p = 0; p < op.fProxyCnt; ++p) {
                 numTotalQuads += op.fProxies[p].fQuadCnt;
                 auto* proxy = op.fProxies[p].fProxy;
-                if (target->resourceProvider()->explicitlyAllocateGPUResources()) {
-                    if (!proxy->isInstantiated()) {
-                        return;
-                    }
-                } else if (!proxy->instantiate(target->resourceProvider())) {
+                if (!proxy->isInstantiated()) {
                     return;
                 }
                 SkASSERT(proxy->config() == config);