removing GrDrawEffect

src/core/SkXfermode.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkXfermode.h"
@@ skipping 800 matching lines @@
         return GrTBackendEffectFactory<XferEffect>::getInstance();
     }
 
     static const char* Name() { return "XferEffect"; }
 
     SkXfermode::Mode mode() const { return fMode; }
     const GrTextureAccess&  backgroundAccess() const { return fBackgroundAccess; }
 
     class GLEffect : public GrGLEffect {
     public:
-        GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
+        GLEffect(const GrBackendEffectFactory& factory, const GrEffect&)
             : GrGLEffect(factory) {
         }
         virtual void emitCode(GrGLProgramBuilder* builder,
-                              const GrDrawEffect& drawEffect,
+                              const GrEffect& effect,
                               const GrEffectKey& key,
                               const char* outputColor,
                               const char* inputColor,
                               const TransformedCoordsArray& coords,
                               const TextureSamplerArray& samplers) SK_OVERRIDE {
-            SkXfermode::Mode mode = drawEffect.castEffect<XferEffect>().mode();
-            const GrTexture* backgroundTex = drawEffect.castEffect<XferEffect>().backgroundAccess().getTexture();
+            SkXfermode::Mode mode = GrEffect::CastEffect<XferEffect>(effect).mode();
+            const GrTexture* backgroundTex =
+                    GrEffect::CastEffect<XferEffect>(effect).backgroundAccess().getTexture();
             GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();
             const char* dstColor;
             if (backgroundTex) {
                 dstColor = "bgColor";
                 fsBuilder->codeAppendf("\t\tvec4 %s = ", dstColor);
                 fsBuilder->appendTextureLookup(samplers[0], coords[0].c_str(), coords[0].type());
                 fsBuilder->codeAppendf(";\n");
             } else {
                 dstColor = fsBuilder->dstColor();
             }
@@ skipping 120 matching lines @@
                     fsBuilder->codeAppendf("\t\t%s.rgb += (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb;\n",
                                            outputColor, inputColor, dstColor, dstColor, inputColor);
                     break;
                 }
                 default:
                     SkFAIL("Unknown XferEffect mode.");
                     break;
             }
         }
 
-        static inline void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
+        static inline void GenKey(const GrEffect& effect, const GrGLCaps&,
                                   GrEffectKeyBuilder* b) {
             // The background may come from the dst or from a texture.
-            uint32_t key = drawEffect.effect()->numTextures();
+            uint32_t key = effect.numTextures();
             SkASSERT(key <= 1);
-            key |= drawEffect.castEffect<XferEffect>().mode() << 1;
+            key |= GrEffect::CastEffect<XferEffect>(effect).mode() << 1;
             b->add32(key);
         }
 
     private:
         static void HardLight(GrGLFragmentShaderBuilder* fsBuilder,
                               const char* final,
                               const char* src,
                               const char* dst) {
             static const char kComponents[] = {'r', 'g', 'b'};
             for (size_t i = 0; i < SK_ARRAY_COUNT(kComponents); ++i) {
@@ skipping 218 matching lines @@
         if (background) {
             fBackgroundTransform.reset(kLocal_GrCoordSet, background);
             this->addCoordTransform(&fBackgroundTransform);
             fBackgroundAccess.reset(background);
             this->addTextureAccess(&fBackgroundAccess);
         } else {
             this->setWillReadDstColor();
         }
     }
     virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        const XferEffect& s = CastEffect<XferEffect>(other);
+        const XferEffect& s = GrEffect::CastEffect<XferEffect>(other);
         return fMode == s.fMode &&
                fBackgroundAccess.getTexture() == s.fBackgroundAccess.getTexture();
     }
 
     SkXfermode::Mode fMode;
     GrCoordTransform fBackgroundTransform;
     GrTextureAccess  fBackgroundAccess;
 
     typedef GrEffect INHERITED;
 };
@@ skipping 728 matching lines @@
         } else {
             proc16 = rec.fProc16_General;
         }
     }
     return proc16;
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END