initial changes to add local matrix to primitive processor

src/gpu/GrGeometryProcessor.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGeometryProcessor_DEFINED
 #define GrGeometryProcessor_DEFINED
 
@@ skipping 72 matching lines @@
     kIgnored_GrGPInput,
 };
 
 /*
  * GrPrimitiveProcessor defines an interface which all subclasses must implement.  All
  * GrPrimitiveProcessors must proivide seed color and coverage for the Ganesh color / coverage
  * pipelines, and they must provide some notion of equality
  */
 class GrPrimitiveProcessor : public GrProcessor {
 public:
+    virtual const SkMatrix& localMatrix() const = 0;

[bsalomon, 2014/12/19 14:15:53]

Why not just have the base class own a protected matrix init'ed to I and have a
non-virtual getter? Subclasses can set it, but don't have to worry about it if
they don't use it. Looks like you kinda did that on GP anyway. I don't think it
hurts the pathprim case much to hold a matrix but save a vcall.

+
     /*
      * This struct allows the optstate to communicate requirements to the GrPrimitiveProcessor.
      */
     struct InitBT {
         bool fColorIgnored;
         bool fCoverageIgnored;
         GrColor fOverrideColor;
     };
 
     virtual void initBatchTracker(GrBatchTracker*, const InitBT&) const = 0;
@@ skipping 51 matching lines @@
  * A GrGeometryProcessor is a flexible method for rendering a primitive.  The GrGeometryProcessor
  * has complete control over vertex attributes and uniforms(aside from the render target) but it
  * must obey the same contract as any GrPrimitiveProcessor, specifically it must emit a color and
  * coverage into the fragment shader.  Where this color and coverage come from is completely the
  * responsibility of the GrGeometryProcessor.
  */
 class GrGeometryProcessor : public GrPrimitiveProcessor {
 public:
     // TODO the Hint can be handled in a much more clean way when we have deferred geometry or
     // atleast bundles
-    GrGeometryProcessor(GrColor color, bool opaqueVertexColors = false)
+    GrGeometryProcessor(GrColor color,
+                        bool opaqueVertexColors = false,
+                        const SkMatrix& localMatrix = SkMatrix::I())
         : fVertexStride(0)
         , fColor(color)
         , fOpaqueVertexColors(opaqueVertexColors)
         , fWillUseGeoShader(false)
         , fHasVertexColor(false)
-        , fHasLocalCoords(false) {}
+        , fHasLocalCoords(false)
+        , fLocalMatrix(localMatrix) {}
 
     /*
      * This is a safeguard to prevent GPs from going beyond platform specific attribute limits.
      * This number can almost certainly be raised if required.
      */
     static const int kMaxVertexAttribs = 6;
 
     struct GrAttribute {
         GrAttribute(const char* name, GrVertexAttribType type)
             : fName(name)
@@ skipping 29 matching lines @@
         if (this->classID() != that.classID() || !this->hasSameTextureAccesses(that)) {
             return false;
         }
 
         // TODO remove the hint
         const GrGeometryProcessor& other = that.cast<GrGeometryProcessor>();
         if (fHasVertexColor && fOpaqueVertexColors != other.fOpaqueVertexColors) {
             return false;
         }
 
+        // TODO let the GP itself make this call
+        if (!fLocalMatrix.cheapEqualTo(other.localMatrix())) {
+            return false;
+        }
+
         // TODO this equality test should really be broken up, some of this can live on the batch
         // tracker test and some of this should be in bundles
         if (!this->onIsEqual(other)) {
             return false;
         }
 
         return this->onCanMakeEqual(mine, theirs);
     }
 
     
     // TODO we can remove color from the GrGeometryProcessor base class once we have bundles of
     // primitive data
     GrColor color() const { return fColor; }
+    const SkMatrix& localMatrix() const SK_OVERRIDE { return fLocalMatrix; }
 
     // TODO this is a total hack until the gp can do deferred geometry
     bool hasVertexColor() const { return fHasVertexColor; }
 
     // TODO this is a total hack until gp can setup and manage local coords
     bool hasLocalCoords() const { return fHasLocalCoords; }
 
     void getInvariantOutputColor(GrInitInvariantOutput* out) const SK_OVERRIDE;
     void getInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE;
 
@@ skipping 54 matching lines @@
     // TODO delete this when we have more advanced equality testing via bundles and the BT
     virtual bool onIsEqual(const GrGeometryProcessor&) const = 0;
 
     SkSTArray<kMaxVertexAttribs, GrAttribute, true> fAttribs;
     size_t fVertexStride;
     GrColor fColor;
     bool fOpaqueVertexColors;
     bool fWillUseGeoShader;
     bool fHasVertexColor;
     bool fHasLocalCoords;
+    SkMatrix fLocalMatrix;

[bsalomon, 2014/12/19 14:15:53]

move to primproc?

 
     typedef GrProcessor INHERITED;
 };
 
 /*
  * The path equivalent of the GP.  For now this just manages color. In the long term we plan on
  * extending this class to handle all nvpr uniform / varying / program work.
  */
 class GrPathProcessor : public GrPrimitiveProcessor {
 public:
-    static GrPathProcessor* Create(GrColor color) {
-        return SkNEW_ARGS(GrPathProcessor, (color));
+    static GrPathProcessor* Create(GrColor color, const SkMatrix& localMatrix = SkMatrix::I()) {
+        return SkNEW_ARGS(GrPathProcessor, (color, localMatrix));
     }
     
     void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE;
 
     bool canMakeEqual(const GrBatchTracker& mine,
                       const GrPrimitiveProcessor& that,
                       const GrBatchTracker& theirs) const SK_OVERRIDE;
 
     const char* name() const SK_OVERRIDE { return "PathProcessor"; }
 
     GrColor color() const { return fColor; }
+    const SkMatrix& localMatrix() const SK_OVERRIDE { return fLocalMatrix; }
 
     void getInvariantOutputColor(GrInitInvariantOutput* out) const SK_OVERRIDE;
     void getInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE;
 
     virtual void getGLProcessorKey(const GrBatchTracker& bt,
                                    const GrGLCaps& caps,
                                    GrProcessorKeyBuilder* b) const SK_OVERRIDE;
 
     virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
 
 private:
-    GrPathProcessor(GrColor color);
+    GrPathProcessor(GrColor color, const SkMatrix& localMatrix);
     GrColor fColor;
+    SkMatrix fLocalMatrix;
 
     typedef GrProcessor INHERITED;
 };
 #endif