Cleanup Default Geo Proc API

src/gpu/GrRectBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrRectBatch.h"
 
 #include "GrBatch.h"
 #include "GrBatchTarget.h"
 #include "GrBatchTest.h"
 #include "GrDefaultGeoProcFactory.h"
 #include "GrPrimitiveProcessor.h"
 
 /** We always use per-vertex colors so that rects can be batched across color changes. Sometimes we
     have explicit local coords and sometimes not. We *could* always provide explicit local coords
     and just duplicate the positions when the caller hasn't provided a local coord rect, but we
     haven't seen a use case which frequently switches between local rect and no local rect draws.
 
     The color param is used to determine whether the opaque hint can be set on the draw state.
     The caller must populate the vertex colors itself.
 
     The vertex attrib order is always pos, color, [local coords].
  */
 static const GrGeometryProcessor* create_rect_gp(bool hasExplicitLocalCoords,
                                                  const SkMatrix* localMatrix,
-                                                 bool usesLocalCoords,
                                                  bool coverageIgnored) {
-    // TODO remove color when we have ignored color from the XP
-    uint32_t flags = GrDefaultGeoProcFactory::kPosition_GPType |
-                     GrDefaultGeoProcFactory::kColor_GPType;
-    flags |= hasExplicitLocalCoords ? GrDefaultGeoProcFactory::kLocalCoord_GPType : 0;
+    typedef GrDefaultGeoProcFactory::Color Color;
+    typedef GrDefaultGeoProcFactory::Coverage Coverage;
+    typedef GrDefaultGeoProcFactory::LocalCoords LocalCoords;
+    Color color(Color::kAttribute_Type);
+    Coverage coverage(coverageIgnored ? Coverage::kNone_Type : Coverage::kSolid_Type);
+    LocalCoords::Type localCoords;
+    if (hasExplicitLocalCoords) {
+        localCoords = LocalCoords::kHasExplicit_Type;
+    } else {
+        localCoords = LocalCoords::kUsePosition_Type;
+    }
+
     if (localMatrix) {
-        return GrDefaultGeoProcFactory::Create(flags, GrColor_WHITE, usesLocalCoords,
-                                               coverageIgnored, SkMatrix::I(), *localMatrix);
+        return GrDefaultGeoProcFactory::Create(color, coverage, localCoords, SkMatrix::I(),
+                                               *localMatrix);
     } else {
-        return GrDefaultGeoProcFactory::Create(flags, GrColor_WHITE, usesLocalCoords,
-                                               coverageIgnored, SkMatrix::I(), SkMatrix::I());
+        return GrDefaultGeoProcFactory::Create(color, coverage, localCoords);
     }
 }
 
 class RectBatch : public GrBatch {
 public:
     struct Geometry {
         SkMatrix fViewMatrix;
         SkRect fRect;
         SkRect fLocalRect;
         SkMatrix fLocalMatrix;
@@ skipping 44 matching lines @@
                 return;
             }
 
             if (this->hasLocalMatrix()) {
                 invert.preConcat(this->localMatrix());
             }
         }
 
         SkAutoTUnref<const GrGeometryProcessor> gp(create_rect_gp(hasExplicitLocalCoords,
                                                                   &invert,
-                                                                  this->usesLocalCoords(),
                                                                   this->coverageIgnored()));
 
         batchTarget->initDraw(gp, pipeline);
 
         int instanceCount = fGeoData.count();
         size_t vertexStride = gp->getVertexStride();
         SkASSERT(hasExplicitLocalCoords ?
                  vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorLocalCoordAttr) :
                  vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorAttr));
         QuadHelper helper;
         void* vertices = helper.init(batchTarget, vertexStride, instanceCount);
 
         if (!vertices) {
             return;
         }
 
         for (int i = 0; i < instanceCount; i++) {
             const Geometry& geom = fGeoData[i];
 
             intptr_t offset = reinterpret_cast<intptr_t>(vertices) +
                               kVerticesPerQuad * i * vertexStride;
             SkPoint* positions = reinterpret_cast<SkPoint*>(offset);
 
             positions->setRectFan(geom.fRect.fLeft, geom.fRect.fTop,
                                   geom.fRect.fRight, geom.fRect.fBottom, vertexStride);
             geom.fViewMatrix.mapPointsWithStride(positions, vertexStride, kVerticesPerQuad);
 
+            // TODO we should only do this if local coords are being read
             if (geom.fHasLocalRect) {
                 static const int kLocalOffset = sizeof(SkPoint) + sizeof(GrColor);
                 SkPoint* coords = reinterpret_cast<SkPoint*>(offset + kLocalOffset);
                 coords->setRectFan(geom.fLocalRect.fLeft, geom.fLocalRect.fTop,
                                    geom.fLocalRect.fRight, geom.fLocalRect.fBottom,
                                    vertexStride);
                 if (geom.fHasLocalMatrix) {
                     geom.fLocalMatrix.mapPointsWithStride(coords, vertexStride, kVerticesPerQuad);
                 }
             }
@@ skipping 129 matching lines @@
     if (hasLocalMatrix) {
         localMatrix = GrTest::TestMatrix(random);
     }
 
     return GrRectBatch::Create(color, viewMatrix, rect,
                                hasLocalRect ? &localRect : NULL,
                                hasLocalMatrix ? &localMatrix : NULL);
 }
 
 #endif