Make GPU coord transforms automatic

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 17 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);
 #ifdef SK_DEBUG
-        static const EffectKey kIllegalIDMask = (uint16_t) (~((1U << kEffectKeyBits) - 1));
-        SkASSERT(!(kIllegalIDMask & effectKey));
+        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));
+
         static const EffectKey kIllegalAttribKeyMask = (uint16_t) (~((1U << kAttribKeyBits) - 1));
         SkASSERT(!(kIllegalAttribKeyMask & textureKey));
+
+        static const EffectKey kIllegalClassIDMask = (uint16_t) (~((1U << kClassIDBits) - 1));
+        SkASSERT(!(kIllegalClassIDMask & fEffectClassID));
 #endif
-        return fEffectClassID | (attribKey << (kEffectKeyBits+kTextureKeyBits)) |
-               (textureKey << kEffectKeyBits) | effectKey;
+        return (fEffectClassID << (kEffectKeyBits+kTextureKeyBits+kTransformKeyBits+kAttribKeyBits)) |
+               (attribKey << (kEffectKeyBits+kTextureKeyBits+kTransformKeyBits)) |
+               (transformKey << (kEffectKeyBits+kTextureKeyBits)) |
+               (textureKey << kEffectKeyBits) |
+               (effectKey);
     }
 
     /** Returns a new instance of the appropriate *GL* implementation class
         for the given GrEffect; caller is responsible for deleting
         the object. */
     virtual GLEffect* createGLInstance(const GrDrawEffect& drawEffect) const SK_OVERRIDE {
         return SkNEW_ARGS(GLEffect, (*this, drawEffect));
     }
 
     /** This class is a singleton. This function returns the single instance.
      */
     static const GrBackendEffectFactory& getInstance() {
         static SkAlignedSTStorage<1, GrTBackendEffectFactory> gInstanceMem;
         static const GrTBackendEffectFactory* gInstance;
         if (!gInstance) {
             gInstance = SkNEW_PLACEMENT(gInstanceMem.get(),
                                         GrTBackendEffectFactory);
         }
         return *gInstance;
     }
 
 protected:
     GrTBackendEffectFactory() {
-        fEffectClassID = GenID() << (kAttribKeyBits + kEffectKeyBits + kTextureKeyBits) ;
+        fEffectClassID = GenID();
     }
 };
 
 #endif