Use new API everywhere for GrDefaultGeoProcFactory

src/gpu/GrAARectRenderer.cpp

Index: src/gpu/GrAARectRenderer.cpp
diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index 93b276ad43ca36e5048ddac9d711a4a81d989fcb..e675804bd202c9db2ef4d9d2a52745de2844f439 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -32,20 +32,29 @@ static void set_inset_fan(SkPoint* pts, size_t stride,
 }
 

[robertphillips, 2015/07/29 13:09:44]

Can we have one copy of this helper method some where ? (This seems like the 3rd
copy I've seen).

 static const GrGeometryProcessor* create_fill_rect_gp(bool tweakAlphaForCoverage,
-                                                      const SkMatrix& localMatrix,
+                                                      const SkMatrix& viewMatrix,
                                                       bool usesLocalCoords,
                                                       bool coverageIgnored) {
-    uint32_t flags = GrDefaultGeoProcFactory::kColor_GPType;
-    const GrGeometryProcessor* gp;
-    if (tweakAlphaForCoverage) {
-        gp = GrDefaultGeoProcFactory::Create(flags, GrColor_WHITE, usesLocalCoords, coverageIgnored,
-                                             SkMatrix::I(), localMatrix);
+    using namespace GrDefaultGeoProcFactory;
+
+    Color color(Color::kAttribute_Type);
+    Coverage::Type coverageType;
+    if (coverageIgnored) {
+        coverageType = Coverage::kNone_Type;
+    } else if (tweakAlphaForCoverage) {
+        coverageType = Coverage::kSolid_Type;
     } else {
-        flags |= GrDefaultGeoProcFactory::kCoverage_GPType;
-        gp = GrDefaultGeoProcFactory::Create(flags, GrColor_WHITE, usesLocalCoords, coverageIgnored,
-                                             SkMatrix::I(), localMatrix);
+        coverageType = Coverage::kAttribute_Type;
+    }
+    Coverage coverage(coverageType);
+
+    if (usesLocalCoords) {
+        LocalCoords localCoords(LocalCoords::kUsePosition_Type);
+        return CreateForDeviceSpace(color, coverage, localCoords, viewMatrix);
+    } else {
+        LocalCoords localCoords(LocalCoords::kUnused_Type);
+       return Create(color, coverage, localCoords);
     }
-    return gp;
 }
 
 GR_DECLARE_STATIC_UNIQUE_KEY(gAAFillRectIndexBufferKey);
@@ -92,16 +101,14 @@ public:
     void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {
         bool canTweakAlphaForCoverage = this->canTweakAlphaForCoverage();
 
-        SkMatrix localMatrix;
-        if (this->usesLocalCoords() && !this->viewMatrix().invert(&localMatrix)) {
-            SkDebugf("Cannot invert\n");
-            return;
-        }
-
         SkAutoTUnref<const GrGeometryProcessor> gp(create_fill_rect_gp(canTweakAlphaForCoverage,
-                                                                       localMatrix,
+                                                                       this->viewMatrix(),
                                                                        this->usesLocalCoords(),
                                                                        this->coverageIgnored()));
+        if (!gp) {
+            SkDebugf("Couldn't create GrGeometryProcessor\n");
+            return;
+        }
 
         batchTarget->initDraw(gp, pipeline);
 
@@ -444,18 +451,14 @@ public:
     void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {
         bool canTweakAlphaForCoverage = this->canTweakAlphaForCoverage();
 
-        // Local matrix is ignored if we don't have local coords.  If we have localcoords we only
-        // batch with identical view matrices
-        SkMatrix localMatrix;
-        if (this->usesLocalCoords() && !this->viewMatrix().invert(&localMatrix)) {
-            SkDebugf("Cannot invert\n");
-            return;
-        }
-
         SkAutoTUnref<const GrGeometryProcessor> gp(create_fill_rect_gp(canTweakAlphaForCoverage,
-                                                                       localMatrix,
+                                                                       this->viewMatrix(),
                                                                        this->usesLocalCoords(),
                                                                        this->coverageIgnored()));
+        if (!gp) {
+            SkDebugf("Couldn't create GrGeometryProcessor\n");
+            return;
+        }
 
         batchTarget->initDraw(gp, pipeline);