commit 290c09b8bbd8d221d363150e2ce87158f4668df0
author joshualitt <joshualitt@chromium.org> Fri Dec 19 13:45:20 2014 -0800
committer Commit bot <commit-bot@chromium.org> Fri Dec 19 13:45:20 2014 -0800
tree 7989675060a6bd1bcd7626139810079d5add3d76
parent bd2f0f34cfa0debf2b60fd864c432ef5cbe96503

initial changes to add local matrix to primitive processor

BUG=skia:

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

src/gpu/GrGeometryProcessor.cpp

diff --git a/src/gpu/GrGeometryProcessor.cpp b/src/gpu/GrGeometryProcessor.cpp
index 5d9cdaf..d47f687 100644
--- a/src/gpu/GrGeometryProcessor.cpp
+++ b/src/gpu/GrGeometryProcessor.cpp
@@ -62,6 +62,7 @@
     GrGPInput fInputColorType;
     GrGPInput fInputCoverageType;
     GrColor fColor;
+    bool fUsesLocalCoords;
 };
 
 class GrGLPathProcessor : public GrGLGeometryProcessor {
@@ -118,7 +119,9 @@
     typedef GrGLGeometryProcessor INHERITED;
 };
 
-GrPathProcessor::GrPathProcessor(GrColor color) : fColor(color) {
+GrPathProcessor::GrPathProcessor(GrColor color, const SkMatrix& localMatrix)
+    : INHERITED(localMatrix)
+    , fColor(color) {
     this->initClassID<GrPathProcessor>();
 }
 
@@ -142,6 +145,7 @@
     }
 
     local->fInputCoverageType = init.fCoverageIgnored ? kIgnored_GrGPInput : kAllOnes_GrGPInput;
+    local->fUsesLocalCoords = init.fUsesLocalCoords;
 }
 
 bool GrPathProcessor::canMakeEqual(const GrBatchTracker& m,
@@ -153,7 +157,9 @@
 
     const PathBatchTracker& mine = m.cast<PathBatchTracker>();
     const PathBatchTracker& theirs = t.cast<PathBatchTracker>();
-    return CanCombineOutput(mine.fInputColorType, mine.fColor,
+    return CanCombineLocalMatrices(*this, mine.fUsesLocalCoords,
+                                   that, theirs.fUsesLocalCoords) &&
+           CanCombineOutput(mine.fInputColorType, mine.fColor,
                             theirs.fInputColorType, theirs.fColor) &&
            CanCombineOutput(mine.fInputCoverageType, 0xff,
                             theirs.fInputCoverageType, 0xff);