Added registerChild; transforms, textures, glKey automatically handled.

include/gpu/GrFragmentProcessor.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrFragmentProcessor_DEFINED
 #define GrFragmentProcessor_DEFINED
 
 #include "GrProcessor.h"
 
 class GrCoordTransform;
 class GrGLSLCaps;
 class GrGLFragmentProcessor;
 class GrProcessorKeyBuilder;
 
 /** Provides custom fragment shader code. Fragment processors receive an input color (vec4f) and
     produce an output color. They may reference textures and uniforms. They may use
     GrCoordTransforms to receive a transformation of the local coordinates that map from local space
     to the fragment being processed.
  */
 class GrFragmentProcessor : public GrProcessor {
 public:
     GrFragmentProcessor()
         : INHERITED()
         , fUsesLocalCoords(false) {}
 
     /** Implemented using GLFragmentProcessor::GenKey as described in this class's comment. */
     virtual void getGLProcessorKey(const GrGLSLCaps& caps,

[joshualitt, 2015/08/03 14:06:02]

Lets rename all of the *IncludeChildProc functions to *, and if any of these
other non-recursive functions are still needed, lets rename them *Priv.

[wangyix, 2015/08/03 16:12:47]

Done.

                                    GrProcessorKeyBuilder* b) const = 0;
 
     /** Returns a new instance of the appropriate *GL* implementation class
         for the given GrFragmentProcessor; caller is responsible for deleting
         the object. */
     virtual GrGLFragmentProcessor* createGLInstance() const = 0;
 
     /** Human-meaningful string to identify this GrFragmentProcessor; may be embedded
         in generated shader code. */
     virtual const char* name() const = 0;
 
+    void getGLProcessorKeyIncludeChildProcs(const GrGLSLCaps& caps,
+                                            GrProcessorKeyBuilder* b) const {
+        this->getGLProcessorKey(caps, b);
+        for (int i = 0; i < fChildProcessors.count(); ++i)

[joshualitt, 2015/08/03 14:06:02]

We put braces around single line for loops.

[wangyix, 2015/08/03 16:12:47]

Done.

+            fChildProcessors[i]->getGLProcessorKeyIncludeChildProcs(caps, b);
+    }
+
     int numTransforms() const { return fCoordTransforms.count(); }
 
+    int numTransformsIncludeChildProcs() const {
+        int numTransforms = fCoordTransforms.count();
+        for (int i = 0; i < fChildProcessors.count(); ++i)

[joshualitt, 2015/08/03 14:06:02]

same

[wangyix, 2015/08/03 16:12:47]

Done.

+            numTransforms += fChildProcessors[i]->numTransformsIncludeChildProcs();
+        return numTransforms;
+    }
+
     /** Returns the coordinate transformation at index. index must be valid according to
         numTransforms(). */
     const GrCoordTransform& coordTransform(int index) const { return *fCoordTransforms[index]; }
 
     const SkTArray<const GrCoordTransform*, true>& coordTransforms() const {
         return fCoordTransforms;
     }
 
+    int numChildProcessors() const { return fChildProcessors.count(); }
+
+    GrFragmentProcessor* childProcessor(int index) const { return fChildProcessors[index]; }
+
+    const SkTArray<GrFragmentProcessor*, false>& childProcessors() const {
+        return fChildProcessors;
+    }
+
+    int numTexturesIncludeChildProcs() const {
+        int numTextures = this->numTextures();
+        for (int i = 0; i < fChildProcessors.count(); ++i)

[joshualitt, 2015/08/03 14:06:02]

same

[wangyix, 2015/08/03 16:12:47]

Done.

+            numTextures += fChildProcessors[i]->numTexturesIncludeChildProcs();
+        return numTextures;
+    }
+
     /** Do any of the coordtransforms for this processor require local coords? */
     bool usesLocalCoords() const { return fUsesLocalCoords; }
 
     /** Returns true if this and other processor conservatively draw identically. It can only return
         true when the two processor are of the same subclass (i.e. they return the same object from
         from getFactory()).
 
         A return value of true from isEqual() should not be used to test whether the processor would
         generate the same shader code. To test for identical code generation use getGLProcessorKey*/
     bool isEqual(const GrFragmentProcessor& that) const {
@@ skipping 29 matching lines @@
      * processor subclass manages the lifetime of the transformations (this function only stores a
      * pointer). The GrCoordTransform is typically a member field of the GrProcessor subclass. 
      *
      * A processor subclass that has multiple methods of construction should always add its coord
      * transforms in a consistent order. The non-virtual implementation of isEqual() automatically
      * compares transforms and will assume they line up across the two processor instances.
      */
     void addCoordTransform(const GrCoordTransform*);
 
     /**
+     * FragmentProcessor subclasses call this to register any child FragmentProcessors they have.
+     * This is for processors whose shader code will be composed of nested processors whose output
+     * colors will be combined somehow to produce its output color.  Registering these child
+     * processors will allow the ProgramBuilder to automatically add their transformed coords and
+     * texture accesses and mangle their uniform and output color names and
+     */
+    void registerChildProcessor(GrFragmentProcessor* child);
+
+    /**
      * Subclass implements this to support getConstantColorComponents(...).
      */
     virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const = 0;
 
 private:
     /**
      * Subclass implements this to support isEqual(). It will only be called if it is known that
      * the two processors are of the same subclass (i.e. they return the same object from
      * getFactory()). The processor subclass should not compare its coord transforms as that will
      * be performed automatically in the non-virtual isEqual().
      */
     virtual bool onIsEqual(const GrFragmentProcessor&) const = 0;
 
     bool hasSameTransforms(const GrFragmentProcessor&) const;
 
     SkSTArray<4, const GrCoordTransform*, true>  fCoordTransforms;
     bool                                         fUsesLocalCoords;
-
+    SkTArray<GrFragmentProcessor*, false>        fChildProcessors;
+        

[joshualitt, 2015/08/03 14:06:02]

delete tab

[wangyix, 2015/08/03 16:12:47]

Done.

     typedef GrProcessor INHERITED;
 };
 
 #endif