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/GrPipeline.cpp

diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 2c15f32..99ad78d 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -39,11 +39,7 @@
     fXferProcessor = processors.refXferProcessor();
 
     if (args.fDstProxy.proxy()) {
-        if (args.fResourceProvider->explicitlyAllocateGPUResources()) {
-            SkASSERT(args.fDstProxy.proxy()->isInstantiated());
-        } else if (!args.fDstProxy.proxy()->instantiate(args.fResourceProvider)) {
-            this->markAsBad();
-        }
+        SkASSERT(args.fDstProxy.proxy()->isInstantiated());
 
         fDstTextureProxy.reset(args.fDstProxy.proxy());
         fDstTextureOffset = args.fDstProxy.offset();