diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-26 19:35:06 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-26 19:35:06 +0000 |
| commit | ad9327f0362599ee97d09fbe2a0693895ed8d4b2 (patch) | |
| tree | 4a2747a1d689afe2bc450c3bdc65d37c92b70dc2 /include | |
| parent | ce8b3de6058eae07ddc2eed6f96701e009bb91ec (diff) | |
Increase space for effect-class-ID and fix assert
https://codereview.chromium.org/12703040/
git-svn-id: http://skia.googlecode.com/svn/trunk@8400 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrBackendEffectFactory.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/gpu/GrBackendEffectFactory.h b/include/gpu/GrBackendEffectFactory.h index da296c9469..28114436de 100644 --- a/include/gpu/GrBackendEffectFactory.h +++ b/include/gpu/GrBackendEffectFactory.h @@ -33,7 +33,7 @@ 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 @@ -68,8 +68,7 @@ protected: 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. |