Move program descriptor and primitive processor off of optstate

src/gpu/gl/GrGLGeometryProcessor.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 GrGLGeometryProcessor_DEFINED
 #define GrGLGeometryProcessor_DEFINED
 
@@ skipping 120 matching lines @@
 /**
  * If a GL effect needs a GrGLFullShaderBuilder* object to emit vertex code, then it must inherit
  * from this class. Since paths don't have vertices, this class is only meant to be used internally
  * by skia, for special cases.
  */
 class GrGLGeometryProcessor : public GrGLPrimitiveProcessor {
 public:
     /* Any general emit code goes in the base class emitCode.  Subclasses override onEmitCode */
     void emitCode(EmitArgs&) SK_OVERRIDE;
 
-    void setTransformData(const GrPrimitiveProcessor*,
+    void setTransformData(const GrPrimitiveProcessor&,
                           const GrGLProgramDataManager&,
                           int index,
                           const SkTArray<const GrCoordTransform*, true>& transforms);
 
 protected:
     // Many GrGeometryProcessors do not need explicit local coords
     void emitTransforms(GrGLGPBuilder* gp,
                         const GrShaderVar& posVar,
                         const SkMatrix& localMatrix,
                         const TransformsIn& tin,
@@ skipping 51 matching lines @@
     void emitCode(EmitArgs&) SK_OVERRIDE;
 
     virtual void emitTransforms(GrGLGPBuilder*, const TransformsIn&, TransformsOut*) = 0;
 
     virtual void resolveSeparableVaryings(GrGLGpu* gpu, GrGLuint programId) {}
 
     void setData(const GrGLProgramDataManager&,
                  const GrPrimitiveProcessor&,
                  const GrBatchTracker&) SK_OVERRIDE;
 
-    virtual void setTransformData(const GrPrimitiveProcessor*,
+    virtual void setTransformData(const GrPrimitiveProcessor&,
                                   int index,
                                   const SkTArray<const GrCoordTransform*, true>& transforms,
                                   GrGLPathRendering*,
                                   GrGLuint programID) = 0;
 
     virtual void didSetData(GrGLPathRendering*) {}
 
 private:
     UniformHandle fColorUniform;
     GrColor fColor;
 
     typedef GrGLPrimitiveProcessor INHERITED;
 };
 
 #endif