commit 8059eb9f6e24ed609393fbda4ad71edea03ac258
author joshualitt <joshualitt@chromium.org> Mon Dec 29 15:10:07 2014 -0800
committer Commit bot <commit-bot@chromium.org> Mon Dec 29 15:10:07 2014 -0800
tree c9a8e1881739206f49a5319bf1077a5900b42db1
parent 4f662e62cd44e302ef689fabdb2c0ae8d9471b02

Move ViewMatrix off of drawstate

BUG=skia:

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

src/gpu/GrGeometryProcessor.cpp

diff --git a/src/gpu/GrGeometryProcessor.cpp b/src/gpu/GrGeometryProcessor.cpp
index d47f687..01ea85a 100644
--- a/src/gpu/GrGeometryProcessor.cpp
+++ b/src/gpu/GrGeometryProcessor.cpp
@@ -119,8 +119,10 @@
     typedef GrGLGeometryProcessor INHERITED;
 };
 
-GrPathProcessor::GrPathProcessor(GrColor color, const SkMatrix& localMatrix)
-    : INHERITED(localMatrix)
+GrPathProcessor::GrPathProcessor(GrColor color,
+                                 const SkMatrix& viewMatrix,
+                                 const SkMatrix& localMatrix)
+    : INHERITED(viewMatrix, localMatrix)
     , fColor(color) {
     this->initClassID<GrPathProcessor>();
 }
@@ -155,6 +157,10 @@
         return false;
     }
 
+    if (!this->viewMatrix().cheapEqualTo(that.viewMatrix())) {
+        return false;
+    }
+
     const PathBatchTracker& mine = m.cast<PathBatchTracker>();
     const PathBatchTracker& theirs = t.cast<PathBatchTracker>();
     return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords,