| Index: include/gpu/GrCacheable.h
|
| diff --git a/include/gpu/GrCacheable.h b/include/gpu/GrCacheable.h
|
| index 344ae6b58319edd1e41fe7222ef0087a188c79e3..5cd9b0d1c43003f9ec4c0cd2c59f094c53b28b55 100644
|
| --- a/include/gpu/GrCacheable.h
|
| +++ b/include/gpu/GrCacheable.h
|
| @@ -46,12 +46,12 @@ public:
|
| * not change when the content of the GrCacheable object changes. This will never return
|
| * 0.
|
| */
|
| - uint32_t getGenerationID() const;
|
| + uint64_t getInstanceID() const { return fInstanceID; }
|
|
|
| protected:
|
| GrCacheable()
|
| : fCacheEntry(NULL)
|
| - , fGenID(0) {}
|
| + , fInstanceID(CreateInstanceID()) {}
|
|
|
| bool isInCache() const { return NULL != fCacheEntry; }
|
|
|
| @@ -64,8 +64,10 @@ protected:
|
| void didChangeGpuMemorySize() const;
|
|
|
| private:
|
| + static uint64_t CreateInstanceID();
|
| +
|
| GrResourceCacheEntry* fCacheEntry; // NULL if not in cache
|
| - mutable uint32_t fGenID;
|
| + mutable uint64_t fInstanceID;
|
|
|
| typedef SkRefCnt INHERITED;
|
| };
|
|
|