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
This commit is contained in:
parent
ce8b3de605
commit
ad9327f036
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user