Move program descriptor and primitive processor off of optstate

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 93 matching lines @@
         GrColor fOverrideColor;
         bool fUsesLocalCoords;
     };
 
     virtual void initBatchTracker(GrBatchTracker*, const InitBT&) const = 0;
 
     virtual bool canMakeEqual(const GrBatchTracker& mine,
                               const GrPrimitiveProcessor& that,
                               const GrBatchTracker& theirs) const = 0;
 
-    /*
-     * We always call canMakeEqual before makeEqual so there is no need to do any kind of equality
-     * testing here
-     * TODO make this pure virtual when primProcs can actually use it
-     */
-    virtual void makeEqual(GrBatchTracker*, const GrBatchTracker&) const {}
-
     virtual void getInvariantOutputColor(GrInitInvariantOutput* out) const = 0;
     virtual void getInvariantOutputCoverage(GrInitInvariantOutput* out) const = 0;
 
     // Only the GrGeometryProcessor subclass actually has a geo shader or vertex attributes, but
     // we put these calls on the base class to prevent having to cast
     virtual bool willUseGeoShader() const = 0;
 
     /*
      * This is a safeguard to prevent GrPrimitiveProcessor's from going beyond platform specific
      * attribute limits. This number can almost certainly be raised if required.
@@ skipping 276 matching lines @@
 
 private:
     bool hasExplicitLocalCoords() const SK_OVERRIDE { return false; }
 
     GrColor fColor;
 
     typedef GrPrimitiveProcessor INHERITED;
 };
 
 #endif