aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrDrawingManager.cpp
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2018-02-07 16:02:38 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-07 16:02:50 +0000
commit8e546043c6d421b82c8f8945f9688e6d64c76a06 (patch)
treef186323839b9216734b7b3ffbc6739006b7021d7 /src/gpu/GrDrawingManager.cpp
parent7558e4dbecac109c5e971f5d028b847070e773e7 (diff)
Revert "Re-enable explicit resource allocation in Skia (take 2)"
This reverts commit ed858ec0951a10bc8bef1f883c925e1ac5e5766f. Reason for revert: Breaking some text GMs Original change's description: > Re-enable explicit resource allocation in Skia (take 2) > > Unsurprisingly, given how we're adding them to the opList's deferredProxy list, a proxy can appear twice. > > Change-Id: I474357a1c3ee8cedf51dbeffcd0e0a96f396375c > Reviewed-on: https://skia-review.googlesource.com/103701 > Commit-Queue: Robert Phillips <robertphillips@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com Change-Id: I90aa30c37bfc506e5a8e4c2ccf3bd1b968fd9c5f No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/105100 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrDrawingManager.cpp')
-rw-r--r--src/gpu/GrDrawingManager.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 47c5ecf691..1897860ee1 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -237,11 +237,7 @@ bool GrDrawingManager::executeOpLists(int startIndex, int stopIndex, GrOpFlushSt
continue;
}
#else
- if (!fOpLists[i]->isInstantiated()) {
- // If the backing surface wasn't allocated drop the draw of the entire opList.
- fOpLists[i] = nullptr;
- continue;
- }
+ SkASSERT(fOpLists[i]->isInstantiated());
#endif
// TODO: handle this instantiation via lazy surface proxies?