Move VertexBuilder to a GrGLFullShaderBuilder subclass

src/gpu/gl/GrGLEffect.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLEffect_DEFINED
 #define GrGLEffect_DEFINED
 
@@ skipping 55 matching lines @@
                             color (or coverage).
         @param inputColor   A vec4 that holds the input color to the stage in the FS. This may be
                             NULL in which case the implied input is solid white (all ones).
                             TODO: Better system for communicating optimization info (e.g. input
                             color is solid white, trans black, known to be opaque, etc.) that allows
                             the effect to communicate back similar known info about its output.
         @param samplers     One entry for each GrTextureAccess of the GrEffect that generated the
                             GrGLEffect. These can be passed to the builder to emit texture
                             reads in the generated code.
         */
+    virtual void emitCode(GrGLFullShaderBuilder* builder,
+                          const GrDrawEffect& drawEffect,
+                          EffectKey key,
+                          const char* outputColor,
+                          const char* inputColor,
+                          const TransformedCoordsArray& coords,
+                          const TextureSamplerArray& samplers) {
+        GrGLShaderBuilder* baseBuilder = builder;
+        this->emitCode(baseBuilder, drawEffect, key, outputColor, inputColor, coords, samplers);
+    }
+
     virtual void emitCode(GrGLShaderBuilder* builder,
                           const GrDrawEffect& drawEffect,
                           EffectKey key,
                           const char* outputColor,
                           const char* inputColor,
                           const TransformedCoordsArray& coords,
                           const TextureSamplerArray& samplers) = 0;
 
     /** A GrGLEffect instance can be reused with any GrEffect that produces the same stage
         key; this function reads data from a stage and uploads any uniform variables required
         by the shaders created in emitCode(). The GrEffect installed in the GrEffectStage is
         guaranteed to be of the same type that created this GrGLEffect and to have an identical
         EffectKey as the one that created this GrGLEffect. Effects that use local coords have
         to consider whether the GrEffectStage's coord change matrix should be used. When explicit
         local coordinates are used it can be ignored. */
     virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) {}
 
     const char* name() const { return fFactory.name(); }
 
     static inline EffectKey GenKey(const GrDrawEffect&, const GrGLCaps&) { return 0; }
 
 protected:
     const GrBackendEffectFactory& fFactory;
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
+class GrGLVertexEffect : public GrGLEffect {
+public:
+    GrGLVertexEffect(const GrBackendEffectFactory& factory) : INHERITED(factory) {}
+
+    virtual void emitCode(GrGLFullShaderBuilder* builder,
+                          const GrDrawEffect& drawEffect,
+                          EffectKey key,
+                          const char* outputColor,
+                          const char* inputColor,
+                          const TransformedCoordsArray& coords,
+                          const TextureSamplerArray& samplers) SK_OVERRIDE = 0;
+
+    virtual void emitCode(GrGLShaderBuilder* builder,

[bsalomon, 2013/10/03 14:44:52]

Is this a case where it would make sense to redeclare the function as
non-virtual? (Want final or sealed!)

[Chris Dalton, 2013/10/03 21:43:22]

Done. (It will be enough protection to hide the GrGLFullShaderBuilder* variant
from the base class, and make the new GrGLFullShader* version pure virtual in
the derived class.)

+                          const GrDrawEffect& drawEffect,
+                          EffectKey key,
+                          const char* outputColor,
+                          const char* inputColor,
+                          const TransformedCoordsArray& coords,
+                          const TextureSamplerArray& samplers) SK_OVERRIDE {
+        GrCrash("GrGLVertexEffect requires a GrGLFullShaderBuilder in emitCode.");
+    }
+
+private:
+    typedef GrGLEffect INHERITED;
+};
+
 #endif