commit 46c77f76be8cbcddccc1ae0058d589cbbdb468f7
author joshualitt <joshualitt@google.com> Tue Feb 03 08:40:22 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Feb 03 08:40:22 2015 -0800
tree f78561b4f0f5d3d8d242d117cbf6456e075a9132
parent 7e80c889deb5ef3df2afa80520d380ae225b4e72

Revert of Hairline batch (patchset #17 id:360001 of https://codereview.chromium.org/876673002/)

Reason for revert:
still a performance regression

Original issue's description:
> Hairline batch
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/6eff8701f027016fbb3147412ec2292dcec2b7f5
>
> Committed: https://skia.googlesource.com/skia/+/658d55cd6121c67488aaf5d0832c9712737f26a5

TBR=bsalomon@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/882883003

src/gpu/GrAARectRenderer.cpp

diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index 420c9e7..48692eb 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -208,7 +208,10 @@
             return false;
         }
 
-        SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
+        if (this->usesLocalCoords() != that->usesLocalCoords()) {
+            return false;
+        }
+
         // We apply the viewmatrix to the rect points on the cpu.  However, if the pipeline uses
         // local coords then we won't be able to batch.  We could actually upload the viewmatrix
         // using vertex attributes in these cases, but haven't investigated that