Move program descriptor and primitive processor off of optstate

src/gpu/GrGeometryProcessor.h

Index: src/gpu/GrGeometryProcessor.h
diff --git a/src/gpu/GrGeometryProcessor.h b/src/gpu/GrGeometryProcessor.h
index 43b6a7e31a4c4302f18eb21115056d3d1668189e..26347c2fcb9a7bcecab723316bf83b1d3bb61dff 100644
--- a/src/gpu/GrGeometryProcessor.h
+++ b/src/gpu/GrGeometryProcessor.h
@@ -111,13 +111,6 @@ public:
                               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;