diff options
author | Chris Dalton <csmartdalton@google.com> | 2017-11-29 20:53:58 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-29 20:54:06 +0000 |
commit | c3fd600c408f9cad8d9b09226e028ec6b22734c8 (patch) | |
tree | ada89456620dad92a5ebbf18600afdf944edb032 /src/gpu/GrRenderTargetOpList.cpp | |
parent | 7072e226ab03ca2a2a7981294639fa8b878a1970 (diff) |
Revert "Make sure to visit clips and dst proxies during gather"
This reverts commit c666502bc6975a73ef352d673b151017a21e8562.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Make sure to visit clips and dst proxies during gather
>
> Bug: skia:7190
> Change-Id: I6ba5bad6e155e9092dff9c2ad3241f603c333b4d
> Reviewed-on: https://skia-review.googlesource.com/76460
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
TBR=robertphillips@google.com,csmartdalton@google.com
Change-Id: I4839594bb97472f5ac2057600a0889c8a9dff5f9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7190
Reviewed-on: https://skia-review.googlesource.com/77781
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetOpList.cpp')
-rw-r--r-- | src/gpu/GrRenderTargetOpList.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp index 6ec8496536..4bdfe589bb 100644 --- a/src/gpu/GrRenderTargetOpList.cpp +++ b/src/gpu/GrRenderTargetOpList.cpp @@ -274,8 +274,11 @@ void GrRenderTargetOpList::gatherProxyIntervals(GrResourceAllocator* alloc) cons auto gather = [ alloc ] (GrSurfaceProxy* p) { alloc->addInterval(p); }; - for (const RecordedOp& recordedOp : fRecordedOps) { - recordedOp.visitProxies(gather); // only diff from the GrTextureOpList version + for (int i = 0; i < fRecordedOps.count(); ++i) { + const GrOp* op = fRecordedOps[i].fOp.get(); // only diff from the GrTextureOpList version + if (op) { + op->visitProxies(gather); + } // Even though the op may have been moved we still need to increment the op count to // keep all the math consistent. |