commit 337432dc092619431eaa62f13e6347f2272f1fa7
author Brian Salomon <bsalomon@google.com> Tue Mar 21 17:36:10 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 21 22:10:33 2017 +0000
tree 7cb93bf20b606f5fb7c05c78254fa601bc5eaaa4
parent 27ecd86b61e6650e9921712e803fb965c7276618

In GrRenderTargetOpList::forwardCombine check adjacent ops

Clears can combine in ways that make it possible to get a combination with an adjacent op in the forward pass.

Change-Id: I39342bbf16fec9b08347652c6e65840ea28f660b
Reviewed-on: https://skia-review.googlesource.com/9972
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrRenderTargetOpList.cpp

diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index 8d47fff..ba096dc 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -295,7 +295,7 @@
     if (fMaxOpLookahead <= 0) {
         return;
     }
-    for (int i = 0; i < fRecordedOps.count() - 2; ++i) {
+    for (int i = 0; i < fRecordedOps.count() - 1; ++i) {
         GrOp* op = fRecordedOps[i].fOp.get();
         GrRenderTarget* renderTarget = fRecordedOps[i].fRenderTarget.get();
         // If we don't have a valid destination render target ID then we cannot reorder.
@@ -312,14 +312,7 @@
                           candidate.fOp->uniqueID());
                 break;
             }
-            if (j == i +1) {
-                // We assume op would have combined with candidate when the candidate was added
-                // via backwards combining in recordOp.
-
-                // not sure why this fires with device-clipping in gm/complexclip4.cpp
-//                SkASSERT(!op->combineIfPossible(candidate.fOp.get(), *this->caps()));
-
-            } else if (op->combineIfPossible(candidate.fOp.get(), *this->caps())) {
+            if (op->combineIfPossible(candidate.fOp.get(), *this->caps())) {
                 GrOP_INFO("\t\tCombining with (%s, B%u)\n", candidate.fOp->name(),
                           candidate.fOp->uniqueID());
                 GR_AUDIT_TRAIL_OPS_RESULT_COMBINED(fAuditTrail, op, candidate.fOp.get());