removing GrDrawEffect

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 21 matching lines @@
     typedef GrGLProgramDataManager::VaryingHandle VaryingHandle;
 
     /**
      * This class emits some of the code inserted into the shaders for an effect. The code it
      * creates may be dependent on properties of the effect that the effect itself doesn't use
      * in its key (e.g. the pixel format of textures used). So this class inserts a meta-key for
      * every effect using this function. It is also responsible for inserting the effect's class ID
      * which must be different for every GrEffect subclass. It can fail if an effect uses too many
      * textures, attributes, etc for the space allotted in the meta-key.
      */
-    static bool GenEffectMetaKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static bool GenEffectMetaKey(const GrEffectStage&,
+                                 bool,
+                                 const GrGLCaps&,
+                                 GrEffectKeyBuilder*);
 
     virtual ~GrGLProgramEffects();
 
     /**
      * Assigns a texture unit to each sampler. It starts on *texUnitIdx and writes the next
      * available unit to *texUnitIdx when it returns.
      */
     void initSamplers(const GrGLProgramDataManager&, int* texUnitIdx);
 
     /**
@@ skipping 54 matching lines @@
         char          fSwizzle[5];
     };
 
     typedef SkTArray<TextureSampler> TextureSamplerArray;
 
 protected:
 
     /**
      * Helpers for GenEffectMetaKey.
      */
-    static uint32_t GenAttribKey(const GrEffect&);
-    static uint32_t GenTransformKey(const GrDrawEffect&);
-    static uint32_t GenTextureKey(const GrDrawEffect&, const GrGLCaps&);
+    static uint32_t GenAttribKey(const GrEffect*);
+    static uint32_t GenTransformKey(const GrEffectStage&, bool);

[bsalomon, 2014/09/15 19:54:25]

seems like we should name the bool param since it's meaning isn't obvious.

+    static uint32_t GenTextureKey(const GrEffect*, const GrGLCaps&);
 
     GrGLProgramEffects(int reserveCount)
         : fGLEffects(reserveCount)
         , fSamplers(reserveCount) {
     }
 
     /**
      * Helper for emitEffect() in a subclasses. Emits uniforms for an effect's texture accesses and
      * appends the necessary data to the TextureSamplerArray* object so effects can add texture
      * lookups to their code. This method is only meant to be called during the construction phase.
      */
-    void emitSamplers(GrGLProgramBuilder*, const GrEffect*, TextureSamplerArray*);
+    void emitSamplers(GrGLProgramBuilder*, const GrEffect&, TextureSamplerArray*);
 
     /**
      * Helper for setData(). Binds all the textures for an effect.
      */
-    void bindTextures(GrGpuGL*, const GrEffect*, int effectIdx);
+    void bindTextures(GrGpuGL*, const GrEffect&, int effectIdx);
 
     struct Sampler {
         SkDEBUGCODE(Sampler() : fTextureUnit(-1) {})
         UniformHandle fUniform;
         int           fTextureUnit;
     };
 
     SkTArray<GrGLEffect*>                  fGLEffects;
     SkTArray<SkSTArray<4, Sampler, true> > fSamplers;
 
@@ skipping 58 matching lines @@
     void emitAttributes(GrGLFullProgramBuilder*, const GrEffectStage&);
 
     /**
      * Helper for emitEffect(). Emits code to implement an effect's coord transforms in the VS.
      * Varyings are added as an outputs of the VS and inputs to the FS. The varyings may be either a
      * vec2f or vec3f depending upon whether perspective interpolation is required or not. The names
      * of the varyings in the VS and FS as well their types are appended to the
      * TransformedCoordsArray* object, which is in turn passed to the effect's emitCode() function.
      */
     void emitTransforms(GrGLFullProgramBuilder*,
-                        const GrDrawEffect&,
+                        const GrEffectStage&,
                         TransformedCoordsArray*);
 
     /**
      * Helper for setData(). Sets all the transform matrices for an effect.
      */
-    void setTransformData(GrGpuGL* gpu, const GrGLProgramDataManager&, const GrDrawEffect&, int effectIdx);
-    void setPathTransformData(GrGpuGL* gpu, const GrGLProgramDataManager&, const GrDrawEffect&,
+    void setTransformData(GrGpuGL* gpu, const GrGLProgramDataManager&, const GrEffectStage&,
+                          int effectIdx);
+    void setPathTransformData(GrGpuGL* gpu, const GrGLProgramDataManager&, const GrEffectStage&,
                               int effectIdx);
 
     struct Transform {
         Transform() { fCurrentValue = SkMatrix::InvalidMatrix(); }
         UniformHandle fHandle;
         SkMatrix      fCurrentValue;
     };
 
     struct PathTransform {
         PathTransform() { fCurrentValue = SkMatrix::InvalidMatrix(); }
@@ skipping 67 matching lines @@
 
     /**
      * Helper for emitEffect(). Allocates texture units from the builder for each transform in an
      * effect. The transforms all use adjacent texture units. They either use two or three of the
      * coordinates at a given texture unit, depending on if they need perspective interpolation.
      * The expressions to access the transformed coords (i.e. 'vec2(gl_TexCoord[0])') as well as the
      * types are appended to the TransformedCoordsArray* object, which is in turn passed to the
      * effect's emitCode() function.
      */
     void setupPathTexGen(GrGLFragmentOnlyProgramBuilder*,
-                         const GrDrawEffect&,
+                         const GrEffectStage&,
                          TransformedCoordsArray*);
 
     /**
      * Helper for setData(). Sets the PathTexGen state for each transform in an effect.
      */
-    void setPathTexGenState(GrGpuGL*, const GrDrawEffect&, int effectIdx);
+    void setPathTexGenState(GrGpuGL*, const GrEffectStage&, int effectIdx);
 
     struct Transforms {
         Transforms(uint32_t transformKey, int texCoordIndex)
             : fTransformKey(transformKey), fTexCoordIndex(texCoordIndex) {}
         uint32_t    fTransformKey;
         int         fTexCoordIndex;
     };
 
     SkTArray<Transforms> fTransforms;
 
@@ skipping 19 matching lines @@
      */
     GrGLProgramEffects* finish() { return fProgramEffects.detach(); }
 private:
     GrGLFragmentOnlyProgramBuilder*          fBuilder;
     SkAutoTDelete<GrGLPathTexGenProgramEffects> fProgramEffects;
     typedef GrGLProgramEffectsBuilder INHERITED;
 };
 
 
 #endif