Increase space for effect-class-ID and fix assert

include/gpu/GrBackendEffectFactory.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 GrBackendEffectFactory_DEFINED
 #define GrBackendEffectFactory_DEFINED
 
@@ skipping 15 matching lines @@
 class GrEffectRef;
 class GrGLEffect;
 class GrGLCaps;
 class GrDrawEffect;
 
 class GrBackendEffectFactory : public GrNoncopyable {
 public:
     typedef uint32_t EffectKey;
     enum {
         kNoEffectKey = 0,
-        kEffectKeyBits = 16,
+        kEffectKeyBits = 15,
         /**
          * Some aspects of the generated code may be determined by the particular textures that are
          * associated with the effect. These manipulations are performed by GrGLShaderBuilder beyond
          * GrGLEffects' control. So there is a dedicated part of the key which is combined
          * automatically with the bits produced by GrGLEffect::GenKey().
          */
         kTextureKeyBits = 6,
         kAttribKeyBits = 6
     };
 
@@ skipping 14 matching lines @@
         kIllegalEffectClassID = 0,
     };
 
     GrBackendEffectFactory() {
         fEffectClassID = kIllegalEffectClassID;
     }
     virtual ~GrBackendEffectFactory() {}
 
     static EffectKey GenID() {
         GR_DEBUGCODE(static const int32_t kClassIDBits = 8 * sizeof(EffectKey) -
-                                            kTextureKeyBits -
-                                    kEffectKeyBits);
+                           kTextureKeyBits - kEffectKeyBits - kAttribKeyBits);
         // fCurrEffectClassID has been initialized to kIllegalEffectClassID. The
         // atomic inc returns the old value not the incremented value. So we add
         // 1 to the returned value.
         int32_t id = sk_atomic_inc(&fCurrEffectClassID) + 1;
         GrAssert(id < (1 << kClassIDBits));
         return static_cast<EffectKey>(id);
     }
 
     EffectKey fEffectClassID;
 
 private:
     static int32_t fCurrEffectClassID;
 };
 
 #endif