Repurpose GrGLCoordTransform as GrGLEffectArray

include/gpu/GrTBackendEffectFactory.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTBackendEffectFactory_DEFINED
 #define GrTBackendEffectFactory_DEFINED
 
@@ skipping 16 matching lines @@
 
     /** Returns a value that identifies the GLSL shader code generated by
         a GrEffect. This enables caching of generated shaders. Part of the
         id identifies the GrEffect subclass. The remainder is based
         on the aspects of the GrEffect object's configuration that affect
         GLSL code generation. */
     virtual EffectKey glEffectKey(const GrDrawEffect& drawEffect,
                                   const GrGLCaps& caps) const SK_OVERRIDE {
         SkASSERT(kIllegalEffectClassID != fEffectClassID);
         EffectKey effectKey = GLEffect::GenKey(drawEffect, caps);
-        EffectKey textureKey = GLEffect::GenTextureKey(drawEffect, caps);
-        EffectKey transformKey = GLEffect::GenTransformKey(drawEffect);
-        EffectKey attribKey = GLEffect::GenAttribKey(drawEffect);
+        EffectKey textureKey = GLEffect::ArrayClass::GenTextureKey(drawEffect, caps);
+        EffectKey transformKey = GLEffect::ArrayClass::GenTransformKey(drawEffect);
+        EffectKey attribKey = GLEffect::ArrayClass::GenAttribKey(drawEffect);

[Chris Dalton, 2013/10/02 19:57:32]

I'm not sure I'm a huge fan of this 'ArrayClass' approach, but I couldn't think
of anything better.

[bsalomon, 2013/10/02 20:17:06]

Why do we need the typedef and nested scoping anyway? (I see it was like that
before, I just can't remember why).

[Chris Dalton, 2013/10/02 20:24:09]

This class is a template factory for any Effect. (So GLEffect is like,
GrGLSimpleTextureEffect, or GrGLConical2Gradient.

I thought it was weird to include GrGLEffectArray since this class exists at the
Gr level, but I didn't realize the method we'r in is called 'glEffectKey'. I'm
leaning toward that now -- using GrGLEffectArray directly. Does that sound good
to you?

[Chris Dalton, 2013/10/02 21:25:43]

Done.

 #ifdef SK_DEBUG
         static const EffectKey kIllegalEffectKeyMask = (uint16_t) (~((1U << kEffectKeyBits) - 1));
         SkASSERT(!(kIllegalEffectKeyMask & effectKey));
 
         static const EffectKey kIllegalTextureKeyMask = (uint16_t) (~((1U << kTextureKeyBits) - 1));
         SkASSERT(!(kIllegalTextureKeyMask & textureKey));
 
         static const EffectKey kIllegalTransformKeyMask = (uint16_t) (~((1U << kTransformKeyBits) - 1));
         SkASSERT(!(kIllegalTransformKeyMask & transformKey));
 
@@ skipping 29 matching lines @@
         return *gInstance;
     }
 
 protected:
     GrTBackendEffectFactory() {
         fEffectClassID = GenID();
     }
 };
 
 #endif