Initial change to create GeometryProcessor

src/gpu/gl/GrGLProgramEffects.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 GrGLProgramEffects_DEFINED
 #define GrGLProgramEffects_DEFINED
 
@@ skipping 39 matching lines @@
     void initSamplers(const GrGLProgramDataManager&, int* texUnitIdx);
 
     /**
      * Calls setData() on each effect, and sets their transformation matrices and texture bindings.
      */
     virtual void setData(GrGpuGL*,
                          GrGpu::DrawType,
                          const GrGLProgramDataManager&,
                          const GrEffectStage* effectStages[]) = 0;
 
+    virtual void setData(GrGpuGL*,
+                         GrGpu::DrawType,
+                         const GrGLProgramDataManager&,
+                         const GrEffectStage* effectStages) { SkFAIL("DO NOT USE"); }
+
     void addEffect(GrGLEffect* effect) { fGLEffects.push_back(effect); }
 
     /**
      * Passed to GrGLEffects so they can add transformed coordinates to their shader code.
      */
     class TransformedCoords {
     public:
         TransformedCoords(const SkString& name, GrSLType type)
             : fName(name), fType(type) {
         }
@@ skipping 63 matching lines @@
     struct Sampler {
         SkDEBUGCODE(Sampler() : fTextureUnit(-1) {})
         UniformHandle fUniform;
         int           fTextureUnit;
     };
 
     SkTArray<GrGLEffect*>                  fGLEffects;
     SkTArray<SkSTArray<4, Sampler, true> > fSamplers;
 
 private:
-    friend class GrGLFragmentO;
     typedef SkRefCnt INHERITED;
 };
 
 /**
  * This is an abstract base class for constructing different types of GrGLProgramEffects objects.
  */
 class GrGLProgramEffectsBuilder {
 public:
     virtual ~GrGLProgramEffectsBuilder() { }
     /**
@@ skipping 11 matching lines @@
 /**
  * This is a GrGLProgramEffects implementation that does coord transforms with the vertex shader.
  */
 class GrGLVertexProgramEffects : public GrGLProgramEffects {
 public:
     virtual void setData(GrGpuGL*,
                          GrGpu::DrawType,
                          const GrGLProgramDataManager&,
                          const GrEffectStage* effectStages[]) SK_OVERRIDE;
 
+    virtual void setData(GrGpuGL*,
+                         GrGpu::DrawType,
+                         const GrGLProgramDataManager&,
+                         const GrEffectStage* effectStages) SK_OVERRIDE;
+
 private:
     friend class GrGLFullProgramBuilder;
 
     GrGLVertexProgramEffects(int reserveCount, bool explicitLocalCoords)
         : INHERITED(reserveCount)
         , fTransforms(reserveCount)
         , fHasExplicitLocalCoords(explicitLocalCoords) {
     }
     /**
      * This method is meant to only be called during the construction phase.
@@ skipping 152 matching lines @@
      */
     GrGLProgramEffects* finish() { return fProgramEffects.detach(); }
 private:
     GrGLFragmentOnlyProgramBuilder*          fBuilder;
     SkAutoTDelete<GrGLPathTexGenProgramEffects> fProgramEffects;
     typedef GrGLProgramEffectsBuilder INHERITED;
 };
 
 
 #endif