Added tree structure to GrGLFragmentProcessor, i.e. GL instances

src/gpu/effects/GrCustomXfermode.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "effects/GrCustomXfermode.h"
 #include "effects/GrCustomXfermodePriv.h"
 
@@ skipping 441 matching lines @@
         GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder();
         const char* dstColor = "bgColor";
         fsBuilder->codeAppendf("vec4 %s = ", dstColor);
         fsBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
                                        args.fCoords[0].getType());
         fsBuilder->codeAppendf(";");
 
         emit_custom_xfermode_code(mode, fsBuilder, args.fOutputColor, args.fInputColor, dstColor);
     }
 
-    void setData(const GrGLProgramDataManager&, const GrProcessor&) override {}
-
     static void GenKey(const GrFragmentProcessor& proc, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
         // The background may come from the dst or from a texture.
         uint32_t key = proc.numTextures();
         SkASSERT(key <= 1);
         key |= proc.cast<GrCustomXferFP>().mode() << 1;
         b->add32(key);
     }
 
+protected:
+    void onSetData(const GrGLProgramDataManager&, const GrProcessor&) override {}
+
 private:
     typedef GrGLFragmentProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrCustomXferFP::GrCustomXferFP(GrProcessorDataManager*, SkXfermode::Mode mode, GrTexture* background)
     : fMode(mode) {
     this->initClassID<GrCustomXferFP>();
 
     SkASSERT(background);
     fBackgroundTransform.reset(kLocal_GrCoordSet, background, 
                                GrTextureParams::kNone_FilterMode);
     this->addCoordTransform(&fBackgroundTransform);
     fBackgroundAccess.reset(background);
     this->addTextureAccess(&fBackgroundAccess);
 }
 
 void GrCustomXferFP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
     GLCustomXferFP::GenKey(*this, caps, b);
 }
 
-GrGLFragmentProcessor* GrCustomXferFP::createGLInstance() const {
+GrGLFragmentProcessor* GrCustomXferFP::onCreateGLInstance() const {
     return SkNEW_ARGS(GLCustomXferFP, (*this));
 }
 
 bool GrCustomXferFP::onIsEqual(const GrFragmentProcessor& other) const {
     const GrCustomXferFP& s = other.cast<GrCustomXferFP>();
     return fMode == s.fMode;
 }
 
 void GrCustomXferFP::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
@@ skipping 113 matching lines @@
                                  const char* outColor, const GrXferProcessor& proc) override {
         const CustomXP& xp = proc.cast<CustomXP>();
         SkASSERT(!xp.hasHWBlendEquation());
 
         GrGLXPFragmentBuilder* fsBuilder = pb->getFragmentShaderBuilder();
         emit_custom_xfermode_code(xp.mode(), fsBuilder, outColor, srcColor, dstColor);
     }
 
     void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) override {}
 
-    typedef GrGLFragmentProcessor INHERITED;
+    typedef GrGLXferProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void CustomXP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
     GLCustomXP::GenKey(*this, caps, b);
 }
 
 GrGLXferProcessor* CustomXP::createGLInstance() const {
     SkASSERT(this->willReadDstColor() != this->hasHWBlendEquation());
@@ skipping 165 matching lines @@
 }
 
 GR_DEFINE_XP_FACTORY_TEST(GrCustomXPFactory);
 GrXPFactory* GrCustomXPFactory::TestCreate(GrProcessorTestData* d) {
     int mode = d->fRandom->nextRangeU(SkXfermode::kLastCoeffMode + 1,
                                       SkXfermode::kLastSeparableMode);
 
     return SkNEW_ARGS(GrCustomXPFactory, (static_cast<SkXfermode::Mode>(mode)));
 }