commit 043a737317ec737c8801b873e9a1d14dbb46c42b
author Adlai Holler <adlai@google.com> Mon Mar 08 17:35:27 2021 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 09 01:21:09 2021 +0000
tree 08dde85430ded710d0d4e17057b7c2d2abbca475
parent 1cf56817f88953ca588db938513b0f6bfb24b888

GrResourceAllocator: cleanup after failed instantiation

Failed instantiations are ultra-rare, so instead of trying to return
early in that case, go ahead and finish iterating through the list
so that it's cleared out and the cleanup-assertions in the
destructor pass.

Bug: skia:10877
Change-Id: I1452e4521fb35a374a046e15df1fe33630f72df9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/381756
Auto-Submit: Adlai Holler <adlai@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Adlai Holler <adlai@google.com>

src/gpu/GrResourceAllocator.cpp

diff --git a/src/gpu/GrResourceAllocator.cpp b/src/gpu/GrResourceAllocator.cpp
index fd5dc7f..2171c9e 100644
--- a/src/gpu/GrResourceAllocator.cpp
+++ b/src/gpu/GrResourceAllocator.cpp
@@ -311,7 +311,7 @@
     this->determineRecyclability();
 
     Interval* cur = nullptr;
-    while ((cur = fIntvlList.popHead()) && !fFailedInstantiation) {
+    while ((cur = fIntvlList.popHead())) {
         this->expire(cur->start());
 
         if (cur->proxy()->isInstantiated()) {