Allow GrGLEffects to produce variable length keys.

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
 
 #include "GrBackendEffectFactory.h"
 #include "GrGLUniformManager.h"
 #include "GrTexture.h"
 #include "GrTextureAccess.h"
 
 class GrEffect;
 class GrEffectStage;
 class GrGLVertexProgramEffectsBuilder;
 class GrGLShaderBuilder;
 class GrGLFullShaderBuilder;
 class GrGLFragmentOnlyShaderBuilder;
 
 /**
  * This class encapsulates an array of GrGLEffects and their supporting data (coord transforms
  * and textures). It is built with GrGLProgramEffectsBuilder, then used to manage the necessary GL
  * state and shader uniforms.
  */
 class GrGLProgramEffects : public SkRefCnt {
 public:
-    typedef GrBackendEffectFactory::EffectKey EffectKey;
     typedef GrGLUniformManager::UniformHandle UniformHandle;
 
     /**
      * 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.
      */
@@ skipping 56 matching lines @@
         uint32_t      fConfigComponentMask;
         char          fSwizzle[5];
     };
 
     typedef SkTArray<TextureSampler> TextureSamplerArray;
 
 protected:
     /**
      * Helpers for GenEffectMetaKey.
      */
-    static EffectKey GenAttribKey(const GrDrawEffect&);
-    static EffectKey GenTransformKey(const GrDrawEffect&);
-    static EffectKey GenTextureKey(const GrDrawEffect&, const GrGLCaps&);
+    static uint32_t GenAttribKey(const GrDrawEffect&);
+    static uint32_t GenTransformKey(const GrDrawEffect&);
+    static uint32_t GenTextureKey(const GrDrawEffect&, 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.
@@ skipping 22 matching lines @@
  * This is an abstract base class for constructing different types of GrGLProgramEffects objects.
  */
 class GrGLProgramEffectsBuilder {
 public:
     virtual ~GrGLProgramEffectsBuilder() { }
 
     /**
      * Emits the effect's shader code, and stores the necessary uniforms internally.
      */
     virtual void emitEffect(const GrEffectStage&,
-                            GrGLProgramEffects::EffectKey,
+                            const GrEffectKey&,
                             const char* outColor,
                             const char* inColor,
                             int stageIndex) = 0;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * This is a GrGLProgramEffects implementation that does coord transforms with the vertex shader.
  */
@@ skipping 11 matching lines @@
         , fTransforms(reserveCount)
         , fHasExplicitLocalCoords(explicitLocalCoords) {
     }
 
     /**
      * Helper for GrGLProgramEffectsBuilder::emitEfffect(). This method is meant to only be called
      * during the construction phase.
      */
     void emitEffect(GrGLFullShaderBuilder*,
                     const GrEffectStage&,
-                    GrGLProgramEffects::EffectKey,
+                    const GrEffectKey&,
                     const char* outColor,
                     const char* inColor,
                     int stageIndex);
 
     /**
      * Helper for emitEffect(). Emits any attributes an effect may have.
      */
     void emitAttributes(GrGLFullShaderBuilder*, const GrEffectStage&);
 
     /**
@@ skipping 26 matching lines @@
 
 /**
  * This class is used to construct a GrGLVertexProgramEffects* object.
  */
 class GrGLVertexProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
 public:
     GrGLVertexProgramEffectsBuilder(GrGLFullShaderBuilder*, int reserveCount);
     virtual ~GrGLVertexProgramEffectsBuilder() { }
 
     virtual void emitEffect(const GrEffectStage&,
-                            GrGLProgramEffects::EffectKey,
+                            const GrEffectKey&,
                             const char* outColor,
                             const char* inColor,
                             int stageIndex) SK_OVERRIDE;
 
     /**
      * Finalizes the building process and returns the effect array. After this call, the builder
      * becomes invalid.
      */
     GrGLProgramEffects* finish() { return fProgramEffects.detach(); }
 
@@ skipping 23 matching lines @@
         : INHERITED(reserveCount)
         , fTransforms(reserveCount) {
     }
 
     /**
      * Helper for GrGLProgramEffectsBuilder::emitEfffect(). This method is meant to only be called
      * during the construction phase.
      */
     void emitEffect(GrGLFragmentOnlyShaderBuilder*,
                     const GrEffectStage&,
-                    GrGLProgramEffects::EffectKey,
+                    const GrEffectKey&,
                     const char* outColor,
                     const char* inColor,
                     int stageIndex);
 
     /**
      * 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(GrGLFragmentOnlyShaderBuilder*,
                          const GrDrawEffect&,
                          TransformedCoordsArray*);
 
     /**
      * Helper for setData(). Sets the PathTexGen state for each transform in an effect.
      */
     void setPathTexGenState(GrGpuGL*, const GrDrawEffect&, int effectIdx);
 
     struct Transforms {
-        Transforms(EffectKey transformKey, int texCoordIndex)
+        Transforms(uint32_t transformKey, int texCoordIndex)
             : fTransformKey(transformKey), fTexCoordIndex(texCoordIndex) {}
-        EffectKey fTransformKey;
-        int fTexCoordIndex;
+        uint32_t    fTransformKey;
+        int         fTexCoordIndex;
     };
 
     SkTArray<Transforms> fTransforms;
 
     typedef GrGLProgramEffects INHERITED;
 };
 
 /**
  * This class is used to construct a GrGLPathTexGenProgramEffects* object.
  */
 class GrGLPathTexGenProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
 public:
     GrGLPathTexGenProgramEffectsBuilder(GrGLFragmentOnlyShaderBuilder*, int reserveCount);
     virtual ~GrGLPathTexGenProgramEffectsBuilder() { }
 
     virtual void emitEffect(const GrEffectStage&,
-                            GrGLProgramEffects::EffectKey,
+                            const GrEffectKey&,
                             const char* outColor,
                             const char* inColor,
                             int stageIndex) SK_OVERRIDE;
 
     /**
      * Finalizes the building process and returns the effect array. After this call, the builder
      * becomes invalid.
      */
     GrGLProgramEffects* finish() { return fProgramEffects.detach(); }
 
 private:
     GrGLFragmentOnlyShaderBuilder*          fBuilder;
     SkAutoTDelete<GrGLPathTexGenProgramEffects> fProgramEffects;
 
     typedef GrGLProgramEffectsBuilder INHERITED;
 };
 
 #endif