Merge "Don't increment the paint's generation ID when drawing bitmaps" into jb-mr2-dev

1 files changed, 8 insertions, 2 deletions

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 34d1c983f87d..9df0c5852189 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -2942,8 +2942,14 @@ void OpenGLRenderer::setupPaintFilter(int clearBits, int setBits) {
     mDrawModifiers.mPaintFilterSetBits = setBits & SkPaint::kAllFlags;
 }
 
-SkPaint* OpenGLRenderer::filterPaint(SkPaint* paint) {
-    if (CC_LIKELY(!mDrawModifiers.mHasDrawFilter || !paint)) return paint;
+SkPaint* OpenGLRenderer::filterPaint(SkPaint* paint, bool alwaysCopy) {
+    if (CC_LIKELY(!mDrawModifiers.mHasDrawFilter || !paint)) {
+        if (CC_UNLIKELY(alwaysCopy)) {
+            mFilteredPaint = *paint;
+            return &mFilteredPaint;
+        }
+        return paint;
+    }
 
     uint32_t flags = paint->getFlags();