Index: include/gpu/GrTBackendEffectFactory.h |
diff --git a/include/gpu/GrTBackendEffectFactory.h b/include/gpu/GrTBackendEffectFactory.h |
index 9528f8a367c851891efe17d9f79a4855ebf3467d..58da8dc64eac63dd31b0495f3d1bd1f64a424f19 100644 |
--- a/include/gpu/GrTBackendEffectFactory.h |
+++ b/include/gpu/GrTBackendEffectFactory.h |
@@ -34,9 +34,9 @@ public: |
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' a
bsalomon
2013/10/02 20:17:06
Why do we need the typedef and nested scoping anyw
Chris Dalton
2013/10/02 20:24:09
This class is a template factory for any Effect. (
Chris Dalton
2013/10/02 21:25:43
Done.
|
#ifdef SK_DEBUG |
static const EffectKey kIllegalEffectKeyMask = (uint16_t) (~((1U << kEffectKeyBits) - 1)); |
SkASSERT(!(kIllegalEffectKeyMask & effectKey)); |