Opt state takes a GP instead of a GeometryStage

src/gpu/GrOptDrawState.h

Index: src/gpu/GrOptDrawState.h
diff --git a/src/gpu/GrOptDrawState.h b/src/gpu/GrOptDrawState.h
index 2721e9dca43eccaeff931df3cde696022f3d6701..0a70f63ecaa580325e5ad52e0fd07da0d5dd977c 100644
--- a/src/gpu/GrOptDrawState.h
+++ b/src/gpu/GrOptDrawState.h
@@ -127,7 +127,7 @@ public:
     }
 
     bool hasGeometryProcessor() const { return SkToBool(fGeometryProcessor.get()); }
-    const GrGeometryStage* getGeometryProcessor() const { return fGeometryProcessor.get(); }
+    const GrGeometryProcessor* getGeometryProcessor() const { return fGeometryProcessor.get(); }
     const GrFragmentStage& getColorStage(int idx) const { return fColorStages[idx]; }
     const GrFragmentStage& getCoverageStage(int idx) const { return fCoverageStages[idx]; }
 
@@ -434,9 +434,10 @@ private:
     GrBlendCoeff                        fDstBlend;
 
     typedef SkSTArray<8, GrFragmentStage> FragmentStageArray;
-    SkAutoTDelete<GrGeometryStage>        fGeometryProcessor;
-    FragmentStageArray                    fColorStages;
-    FragmentStageArray                    fCoverageStages;
+    typedef GrProgramElementRef<const GrGeometryProcessor> ProgramGeometryProcessor;
+    ProgramGeometryProcessor            fGeometryProcessor;
+    FragmentStageArray                  fColorStages;
+    FragmentStageArray                  fCoverageStages;
 
     // This is simply a different representation of info in fVertexAttribs and thus does
     // not need to be compared in op==.