commit d0afeac6dfc0856eeb72e6176ad6335e81871d24
author Chris Craik <ccraik@google.com> Fri Mar 15 18:43:11 2013 -0700
committer Chris Craik <ccraik@google.com> Fri Mar 15 18:48:41 2013 -0700
tree b850971ba9f3e12093fa550284b56f49e91df6ad
parent 2e6ce4f737dcdeb748f467836dd12490c0cdfd22

Reset draw modifiers after flushing

bug:8401910

This avoids leaving the renderer in a state with stale pointers (to,
e.g., shaders or color filters)

Change-Id: Idf8b63657041352e70e34e91ea416fe4385d4bc2

libs/hwui/DeferredDisplayList.cpp

diff --git a/libs/hwui/DeferredDisplayList.cpp b/libs/hwui/DeferredDisplayList.cpp
index 2027fc8..8455545 100644
--- a/libs/hwui/DeferredDisplayList.cpp
+++ b/libs/hwui/DeferredDisplayList.cpp
@@ -372,8 +372,8 @@
     renderer.eventMark("Flush");
 
     renderer.restoreToCount(1);
-
     status |= replayBatchList(mBatches, renderer, dirty);
+    renderer.resetDrawModifiers();
 
     DEFER_LOGD("--flush complete, returning %x", status);
 

libs/hwui/OpenGLRenderer.cpp

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 428980e..e576f76 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -112,10 +112,7 @@
 
 OpenGLRenderer::OpenGLRenderer():
         mCaches(Caches::getInstance()), mExtensions(Extensions::getInstance()) {
-    mDrawModifiers.mShader = NULL;
-    mDrawModifiers.mColorFilter = NULL;
-    mDrawModifiers.mHasShadow = false;
-    mDrawModifiers.mHasDrawFilter = false;
+    resetDrawModifiers();
 
     memcpy(mMeshVertices, gMeshVertices, sizeof(gMeshVertices));
 
@@ -1204,6 +1201,13 @@
 // State Deferral
 ///////////////////////////////////////////////////////////////////////////////
 
+void OpenGLRenderer::resetDrawModifiers() {
+    mDrawModifiers.mShader = NULL;
+    mDrawModifiers.mColorFilter = NULL;
+    mDrawModifiers.mHasShadow = false;
+    mDrawModifiers.mHasDrawFilter = false;
+}
+
 bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDeferFlags) {
     const Rect& currentClip = *(mSnapshot->clipRect);
     const mat4& currentMatrix = *(mSnapshot->transform);

libs/hwui/OpenGLRenderer.h

diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h
index e6c636c..3aa9975 100644
--- a/libs/hwui/OpenGLRenderer.h
+++ b/libs/hwui/OpenGLRenderer.h
@@ -274,6 +274,7 @@
 
     SkPaint* filterPaint(SkPaint* paint, bool alwaysCopy = false);
 
+    void resetDrawModifiers();
     bool storeDisplayState(DeferredDisplayState& state, int stateDeferFlags);
     void restoreDisplayState(const DeferredDisplayState& state, int stateDeferFlags);