commit 82774f8bad1c47124706029b591912c545abdc5a
author Robert Phillips <robertphillips@google.com> Thu Jun 20 14:38:27 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 21 12:31:24 2019 +0000
tree c18e592871c670c92d4a91da10c5259e7341c182
parent 8238a131b63ff474271f55554c26ebafd741f0a9

Cleanup some legacy instantiate calls

Since explicit resource allocation has stuck these instantiate calls are no longer required.

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

src/gpu/GrResourceAllocator.cpp

diff --git a/src/gpu/GrResourceAllocator.cpp b/src/gpu/GrResourceAllocator.cpp
index 67c80c6..4c83509 100644
--- a/src/gpu/GrResourceAllocator.cpp
+++ b/src/gpu/GrResourceAllocator.cpp
@@ -154,6 +154,8 @@
                     GrSurfaceProxy::LazyInstantiationType::kDeinstantiate) {
                     fDeinstantiateTracker->addProxy(proxy);
                 }
+            } else {
+                fLazyInstantiationError = true;
             }
         }
     }
@@ -378,7 +380,8 @@
 
 bool GrResourceAllocator::assign(int* startIndex, int* stopIndex, AssignError* outError) {
     SkASSERT(outError);
-    *outError = AssignError::kNoError;
+    *outError = fLazyInstantiationError ? AssignError::kFailedProxyInstantiation
+                                        : AssignError::kNoError;
 
     SkASSERT(fNumOpLists == fEndOfOpListOpIndices.count());