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

src/gpu/effects/GrYUVtoRGBEffect.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrYUVtoRGBEffect.h"
 
 #include "GrCoordTransform.h"
@@ skipping 62 matching lines @@
                                            args.fCoords[0].getType());
             fsBuilder->codeAppend(".r,\n\t\t");
             fsBuilder->appendTextureLookup(args.fSamplers[1], args.fCoords[1].c_str(),
                                            args.fCoords[1].getType());
             fsBuilder->codeAppend(".r,\n\t\t");
             fsBuilder->appendTextureLookup(args.fSamplers[2], args.fCoords[2].c_str(),
                                            args.fCoords[2].getType());
             fsBuilder->codeAppendf(".r,\n\t\t1.0) * %s;\n", yuvMatrix);
         }
 
-        virtual void setData(const GrGLProgramDataManager& pdman,
+    protected:
+        virtual void onSetData(const GrGLProgramDataManager& pdman,
                              const GrProcessor& processor) override {
             const YUVtoRGBEffect& yuvEffect = processor.cast<YUVtoRGBEffect>();
             switch (yuvEffect.getColorSpace()) {
                 case kJPEG_SkYUVColorSpace:
                     pdman.setMatrix4f(fMatrixUni, kJPEGConversionMatrix);
                     break;
                 case kRec601_SkYUVColorSpace:
                     pdman.setMatrix4f(fMatrixUni, kRec601ConversionMatrix);
                     break;
                 case kRec709_SkYUVColorSpace:
                     pdman.setMatrix4f(fMatrixUni, kRec709ConversionMatrix);
                     break;
             }
         }
 
     private:
         GrGLProgramDataManager::UniformHandle fMatrixUni;
 
         typedef GrGLFragmentProcessor INHERITED;
     };
 
-    GrGLFragmentProcessor* createGLInstance() const override {
-        return SkNEW_ARGS(GLProcessor, (*this));
-    }
-
 private:
     YUVtoRGBEffect(GrProcessorDataManager*, GrTexture* yTexture, GrTexture* uTexture,
                    GrTexture* vTexture, const SkMatrix yuvMatrix[3],
                    GrTextureParams::FilterMode uvFilterMode, SkYUVColorSpace colorSpace)
     : fYTransform(kLocal_GrCoordSet, yuvMatrix[0], yTexture, GrTextureParams::kNone_FilterMode)
     , fYAccess(yTexture)
     , fUTransform(kLocal_GrCoordSet, yuvMatrix[1], uTexture, uvFilterMode)
     , fUAccess(uTexture, uvFilterMode)
     , fVTransform(kLocal_GrCoordSet, yuvMatrix[2], vTexture, uvFilterMode)
     , fVAccess(vTexture, uvFilterMode)
     , fColorSpace(colorSpace) {
         this->initClassID<YUVtoRGBEffect>();
         this->addCoordTransform(&fYTransform);
         this->addTextureAccess(&fYAccess);
         this->addCoordTransform(&fUTransform);
         this->addTextureAccess(&fUAccess);
         this->addCoordTransform(&fVTransform);
         this->addTextureAccess(&fVAccess);
     }
 
+    GrGLFragmentProcessor* onCreateGLInstance() const override {
+        return SkNEW_ARGS(GLProcessor, (*this));
+    }
+
     virtual void onGetGLProcessorKey(const GrGLSLCaps& caps,
                                      GrProcessorKeyBuilder* b) const override {
         GLProcessor::GenKey(*this, caps, b);
     }
 
     bool onIsEqual(const GrFragmentProcessor& sBase) const override {
         const YUVtoRGBEffect& s = sBase.cast<YUVtoRGBEffect>();
         return fColorSpace == s.getColorSpace();
     }
 
@@ skipping 33 matching lines @@
 
 //////////////////////////////////////////////////////////////////////////////
 
 GrFragmentProcessor*
 GrYUVtoRGBEffect::Create(GrProcessorDataManager* procDataManager, GrTexture* yTexture,
                          GrTexture* uTexture, GrTexture* vTexture, const SkISize sizes[3],
                          SkYUVColorSpace colorSpace) {
     SkASSERT(procDataManager && yTexture && uTexture && vTexture && sizes);
     return YUVtoRGBEffect::Create(procDataManager, yTexture, uTexture, vTexture, sizes, colorSpace);
 }