diff options
| author | Romain Guy <romainguy@google.com> | 2012-09-27 18:45:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-27 18:45:42 -0700 |
| commit | a852ff3a4b637e8101c2f54e110467586fe604cf (patch) | |
| tree | 0c940ea5314930c6fdbe15bfc1f4cc17c61d1b78 /libs/hwui/Caches.h | |
| parent | 93aa70c6dfec91909404c9ade9b4a94574814092 (diff) | |
| parent | 6ed9e43879039ce0cbead08d304edbce79a88ced (diff) | |
| download | frameworks_base-a852ff3a4b637e8101c2f54e110467586fe604cf.zip frameworks_base-a852ff3a4b637e8101c2f54e110467586fe604cf.tar.gz frameworks_base-a852ff3a4b637e8101c2f54e110467586fe604cf.tar.bz2 | |
Merge changes I9873540e,I4f6c38e3 into jb-mr1-dev
* changes:
Skia's ColorMatrix vector is in the 0..255 range not 0..1 Bug #7248980
Don't use the QCOM_tiled_rendering extension with functors Bug #7247880
Diffstat (limited to 'libs/hwui/Caches.h')
| -rw-r--r-- | libs/hwui/Caches.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h index 4c292b6..ad1ff6f 100644 --- a/libs/hwui/Caches.h +++ b/libs/hwui/Caches.h @@ -226,6 +226,10 @@ public: void dumpMemoryUsage(); void dumpMemoryUsage(String8& log); + bool hasRegisteredFunctors(); + void registerFunctors(uint32_t functorCount); + void unregisterFunctors(uint32_t functorCount); + bool blend; GLenum lastSrcMode; GLenum lastDstMode; @@ -316,6 +320,8 @@ private: DebugLevel mDebugLevel; bool mInitialized; + + uint32_t mFunctorsCount; }; // class Caches }; // namespace uirenderer |